svn commit: r1361723 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font: PDFont.java PDType0Font.java

[lehmi]

Author: lehmi
Date: Sun Jul 15 16:08:16 2012
New Revision: 1361723

URL: http://svn.apache.org/viewvc?rev=1361723&view=rev
Log:
PDFBOX-1340: use the cmap of the descendant font

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1361723&r1=1361722&r2=1361723&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java 
(original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java 
Sun Jul 15 16:08:16 2012
@@ -480,6 +480,11 @@ public abstract class PDFont implements 
     protected String cmapEncoding( int code, int length, boolean isCIDFont, 
CMap sourceCmap ) throws IOException
     {
         String retval = null;
+        // there is not sourceCmap if this is a descendant font
+        if (sourceCmap == null)
+        {
+            sourceCmap = cmap;
+        }
         if (sourceCmap != null)
         {
             retval = sourceCmap.lookup(code, length);

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1361723&r1=1361722&r2=1361723&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
 Sun Jul 15 16:08:16 2012
@@ -190,7 +190,7 @@ public class PDType0Font extends PDSimpl
             int result = cmap.lookupCID(c, offset, length);
             if (result != -1)
             {
-                retval = descendantFont.cmapEncoding(result, 2, true, cmap);
+                retval = descendantFont.cmapEncoding(result, 2, true, null);
             }
         }
         return retval;