You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/04/03 11:08:10 UTC

svn commit: r1888329 - /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java

Author: lehmi
Date: Sat Apr  3 11:08:10 2021
New Revision: 1888329

URL: http://svn.apache.org/viewvc?rev=1888329&view=rev
Log:
PDFBOX-5143: performance improvements, as suggested by valerybokov

Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java?rev=1888329&r1=1888328&r2=1888329&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java Sat Apr  3 11:08:10 2021
@@ -567,8 +567,7 @@ public class CFFParser
                 {
                     // default
                     font.addValueToTopDict("FontMatrix", topDict.getArray("FontMatrix",
-                            Arrays.<Number>asList(0.001, (double) 0, (double) 0, 0.001,
-                                    (double) 0, (double) 0)));
+                            Arrays.<Number> asList(0.001, 0.0, 0.0, 0.001, 0.0, 0.0)));
                 }
             }
             else if (privMatrix != null)
@@ -1088,13 +1087,13 @@ public class CFFParser
             while (gid < nGlyphs)
             {
                 int rangeFirst = dataInput.readSID();
-                int rangeLeft = dataInput.readCard8();
-                for (int j = 0; j < 1 + rangeLeft; j++)
+                int rangeLeft = dataInput.readCard8() + 1;
+                for (int j = 0; j < rangeLeft; j++)
                 {
                     int sid = rangeFirst + j;
                     charset.addSID(gid + j, sid, readString(sid));
                 }
-                gid += rangeLeft + 1;
+                gid += rangeLeft;
             }
         }
         return charset;
@@ -1123,13 +1122,13 @@ public class CFFParser
             while (gid < nGlyphs)
             {
                 int first = dataInput.readSID();
-                int nLeft = dataInput.readCard16();
-                for (int j = 0; j < 1 + nLeft; j++)
+                int nLeft = dataInput.readCard16() + 1;
+                for (int j = 0; j < nLeft; j++)
                 {
                     int sid = first + j;
                     charset.addSID(gid + j, sid, readString(sid));
                 }
-                gid += nLeft + 1;
+                gid += nLeft;
             }
         }
         return charset;