Author: jeremias
Date: Thu May  5 15:50:20 2011
New Revision: 1099852

URL: http://svn.apache.org/viewvc?rev=1099852&view=rev
Log:
Bugzilla #51144:
Removed invalid entries in ToUnicode table of CID subset fonts.
Submitted by: Mehdi Houshmand <med1985.at.gmail.com>

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
    xmlgraphics/fop/trunk/status.xml

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java?rev=1099852&r1=1099851&r2=1099852&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java Thu May  
5 15:50:20 2011
@@ -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++;
     }
 
     /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java?rev=1099852&r1=1099851&r2=1099852&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java Thu 
May  5 15:50:20 2011
@@ -48,8 +48,7 @@ public class MultiByteFont extends CIDFo
      * 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()) {

Modified: xmlgraphics/fop/trunk/status.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1099852&r1=1099851&r2=1099852&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Thu May  5 15:50:20 2011
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to