Bugzilla #51144:

Removed invalid entries in ToUnicode table of CID subset fonts.
Submitted by: Mehdi Houshmand <med1985.at.gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1099852 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fonts/CIDSubset.java b/src/java/org/apache/fop/fonts/CIDSubset.java
index b152ad38edbaca65708739505f41fe12ed299311..712d8a73b43a563291c0cf5923a61af556eb953a 100644 (file)
--- a/src/java/org/apache/fop/fonts/CIDSubset.java
+++ b/src/java/org/apache/fop/fonts/CIDSubset.java
@@ -62,19 +62,12 @@ public class CIDSubset {
     }
 
     /**
-     * Adds the initial 3 glyphs which are the same for all CID subsets.
+     * Adds the first glyph which is reserved for .notdef for all CID subsets.
      */
-    public void setupFirstThreeGlyphs() {
-        // Make sure that the 3 first glyphs are included
+    public void setupFirstGlyph() {
         usedGlyphs.put(new Integer(0), new Integer(0));
         usedGlyphsIndex.put(new Integer(0), new Integer(0));
         usedGlyphsCount++;
-        usedGlyphs.put(new Integer(1), new Integer(1));
-        usedGlyphsIndex.put(new Integer(1), new Integer(1));
-        usedGlyphsCount++;
-        usedGlyphs.put(new Integer(2), new Integer(2));
-        usedGlyphsIndex.put(new Integer(2), new Integer(2));
-        usedGlyphsCount++;
     }
 
     /**

diff --git a/src/java/org/apache/fop/fonts/MultiByteFont.java b/src/java/org/apache/fop/fonts/MultiByteFont.java
index afac21c1b19d5ac3f092c0c0f6f9846ca1ebe269..629bfa1b73a92f8b3e6a3c135345b7be12c1a5bb 100644 (file)
--- a/src/java/org/apache/fop/fonts/MultiByteFont.java
+++ b/src/java/org/apache/fop/fonts/MultiByteFont.java
@@ -48,8 +48,7 @@ public class MultiByteFont extends CIDFont {
      * Default constructor
      */
     public MultiByteFont() {
-        // Make sure that the 3 first glyphs are included
-        subset.setupFirstThreeGlyphs();
+        subset.setupFirstGlyph();
 
         // Create a quasiunique prefix for fontname
         synchronized (this.getClass()) {

diff --git a/status.xml b/status.xml
index ea011a16470f28e111605d614320be065864691b..895ad3ee0c4f51778f1dee165ff2269b7fda61ab 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -59,6 +59,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Fonts" dev="JM" type="fix" fixes-bug="51144" due-to="Mehdi Houshmand">
+        Removed invalid entries in ToUnicode table of CID subset fonts. 
+      </action>
       <action context="Renderers" dev="JM" type="fix" fixes-bug="50899" due-to="Glenn Adams">
         Fixed mapping of font weights between CSS values and TextAttribute.WEIGHT_*. 
       </action>