From: Jeremias Maerki <jeremias@apache.org>
Date: Thu, 5 May 2011 15:50:20 +0000 (+0000)
Subject: Bugzilla #51144:
X-Git-Tag: fop-1_1rc1old~215
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=173181b3bdd6f4d6ae1e17f0d8ccc717551aaf89;p=xmlgraphics-fop.git

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 b152ad38e..712d8a73b 100644
--- 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 afac21c1b..629bfa1b7 100644
--- 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 ea011a164..895ad3ee0 100644
--- 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>