You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/08/30 03:19:50 UTC

svn commit: r1621409 - /pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java

Author: jahewson
Date: Sat Aug 30 01:19:50 2014
New Revision: 1621409

URL: http://svn.apache.org/r1621409
Log:
PDFBOX-2262: Fix: use CIDs with UCS2 CMaps

Modified:
    pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java

Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1621409&r1=1621408&r2=1621409&view=diff
==============================================================================
--- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java (original)
+++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java Sat Aug 30 01:19:50 2014
@@ -259,8 +259,11 @@ public class PDType0Font extends PDFont
             // if the font is composite and uses a predefined cmap (excluding Identity-H/V) then
             // or if its decendant font uses Adobe-GB1/CNS1/Japan1/Korea1
 
+            // a) Map the character code to a character identifier (CID) according to the font?s CMap
+            int cid = codeToCID(code);
+
             // e) Map the CID according to the CMap from step d), producing a Unicode value
-            return cMapUCS2.toUnicode(code);
+            return cMapUCS2.toUnicode(cid);
         }
         else
         {