svn commit: r1916290 - /pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java

[lehmi]

Author: lehmi
Date: Thu Mar 14 07:35:56 2024
New Revision: 1916290

URL: http://svn.apache.org/viewvc?rev=1916290&view=rev
Log:
PDFBOX-5785: omit in range check for OTF fonts when using identity as 
CIDToGIDMap

Modified:
    
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java

Modified: 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java?rev=1916290&r1=1916289&r2=1916290&view=diff
==============================================================================
--- 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
 (original)
+++ 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
 Thu Mar 14 07:35:56 2024
@@ -319,16 +319,13 @@ public class PDCIDFontType2 extends PDCI
             }
             else
             {
-                // "Identity" is the default CIDToGIDMap
-                if (cid < ttf.getNumberOfGlyphs())
+                // "Identity" is the default for CFF-based OpenTypeFonts
+                if (otf != null && otf.isPostScript())
                 {
                     return cid;
                 }
-                else
-                {
-                    // out of range CIDs map to GID 0
-                    return 0;
-                }
+                // "Identity" is the default for TrueTypeFonts if the CID is 
within the range
+                return otf == null && cid < ttf.getNumberOfGlyphs() ? cid : 0;
             }
         }
     }