ln-dotnet
/
iTextSharp-LGPL
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE when parsing Type 0 fonts without a ToUnicode map (I've seen some winding font entries stored as Type 0 instead of TT in some pdf files) 

git-svn-id: svn://svn.code.sf.net/p/itextsharp/code/trunk@48 820d3149-562b-4f88-9aa4-a8e61a3485cf
master
psoares33 2009-07-06 21:19:56 +00:00
parent 413040747b
commit a7df15bacd
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/iTextSharp/text/pdf/DocumentFont.cs
View File

@ -136,7 +136,7 @@ namespace iTextSharp.text.pdf {
} }
private void ProcessType0(PdfDictionary font) { private void ProcessType0(PdfDictionary font) {
byte[] touni = PdfReader.GetStreamBytes((PRStream)PdfReader.GetPdfObjectRelease(font.Get(PdfName.TOUNICODE))); PdfObject toUniObject = PdfReader.GetPdfObjectRelease(font.Get(PdfName.TOUNICODE));
PdfArray df = (PdfArray)PdfReader.GetPdfObjectRelease(font.Get(PdfName.DESCENDANTFONTS)); PdfArray df = (PdfArray)PdfReader.GetPdfObjectRelease(font.Get(PdfName.DESCENDANTFONTS));
PdfDictionary cidft = (PdfDictionary)PdfReader.GetPdfObjectRelease(df[0]); PdfDictionary cidft = (PdfDictionary)PdfReader.GetPdfObjectRelease(df[0]);
PdfNumber dwo = (PdfNumber)PdfReader.GetPdfObjectRelease(cidft.Get(PdfName.DW)); PdfNumber dwo = (PdfNumber)PdfReader.GetPdfObjectRelease(cidft.Get(PdfName.DW));
@ -146,7 +146,9 @@ namespace iTextSharp.text.pdf {
IntHashtable widths = ReadWidths((PdfArray)PdfReader.GetPdfObjectRelease(cidft.Get(PdfName.W))); IntHashtable widths = ReadWidths((PdfArray)PdfReader.GetPdfObjectRelease(cidft.Get(PdfName.W)));
PdfDictionary fontDesc = (PdfDictionary)PdfReader.GetPdfObjectRelease(cidft.Get(PdfName.FONTDESCRIPTOR)); PdfDictionary fontDesc = (PdfDictionary)PdfReader.GetPdfObjectRelease(cidft.Get(PdfName.FONTDESCRIPTOR));
FillFontDesc(fontDesc); FillFontDesc(fontDesc);
FillMetrics(touni, widths, dw); if (toUniObject != null){
FillMetrics(PdfReader.GetStreamBytes((PRStream)toUniObject), widths, dw);
}
} }
private IntHashtable ReadWidths(PdfArray ws) { private IntHashtable ReadWidths(PdfArray ws) {
@ -638,5 +640,16 @@ namespace iTextSharp.text.pdf {
protected override int[] GetRawCharBBox(int c, String name) { protected override int[] GetRawCharBBox(int c, String name) {
return null; return null;
} }
/**
* Exposes the unicode - > CID map that is constructed from the font's encoding
* @return the unicode to CID map
* @since 2.1.7
*/
internal IntHashtable Uni2Byte {
get {
return uni2byte;
}
}
} }
} }