PDFBOX-6022: don't use identity if there's a predefined cmap

THausherr · THausherr · commit 93061766ebcc · 2025-07-13T10:13:22.000Z
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1927183 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
@@ -541,9 +541,11 @@ public String toUnicode(int code)
         {
             return unicode;
         }
+
         // Use identity mapping if the given ToUnicode CMap doesn't provide any valid mapping
         // a predefined map shall only be used if there isn't any ToUnicode CMap
-        if (getToUnicodeCMap() != null)
+        // PDFBOX-6022: not when there's a predefined cmap
+        if (getToUnicodeCMap() != null && !isCMapPredefined)
         {
             return Character.toString((char) code);
         }

Original file line number	Diff line number	Diff line change
`@@ -541,9 +541,11 @@ public String toUnicode(int code)`
`541`	`541`	`{`
`542`	`542`	`return unicode;`
`543`	`543`	`}`
	`544`	`+`
`544`	`545`	`// Use identity mapping if the given ToUnicode CMap doesn't provide any valid mapping`
`545`	`546`	`// a predefined map shall only be used if there isn't any ToUnicode CMap`
`546`		`- if (getToUnicodeCMap() != null)`
	`547`	`+ // PDFBOX-6022: not when there's a predefined cmap`
	`548`	`+ if (getToUnicodeCMap() != null && !isCMapPredefined)`
`547`	`549`	`{`
`548`	`550`	`return Character.toString((char) code);`
`549`	`551`	`}`