svn commit: r1805308 - in /pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox: cff/CIDKeyedType2CharString.java cff/Type2CharStringParser.java ttf/GlyphRenderer.java

[ti...@apache.org]

Author: tilman
Date: Thu Aug 17 15:56:33 2017
New Revision: 1805308

URL: http://svn.apache.org/viewvc?rev=1805308&view=rev
Log:
PDFBOX-2852: don't use default locale

Modified:
    pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/CIDKeyedType2CharString.java
    pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java
    pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java

Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/CIDKeyedType2CharString.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/CIDKeyedType2CharString.java?rev=1805308&r1=1805307&r2=1805308&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/CIDKeyedType2CharString.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/CIDKeyedType2CharString.java Thu Aug 17 15:56:33 2017
@@ -19,6 +19,7 @@ package org.apache.fontbox.cff;
 import org.apache.fontbox.type1.Type1CharStringReader;
 
 import java.util.List;
+import java.util.Locale;
 
 /**
  * A CID-Keyed Type 2 CharString.
@@ -43,7 +44,7 @@ public class CIDKeyedType2CharString ext
     public CIDKeyedType2CharString(Type1CharStringReader font, String fontName, int cid, int gid, List<Object> sequence, int defaultWidthX, int nomWidthX)
     {
         // glyph name is for debugging only
-        super(font, fontName, String.format("%04x", cid), gid, sequence, defaultWidthX, nomWidthX);
+        super(font, fontName, String.format(Locale.US, "%04x", cid), gid, sequence, defaultWidthX, nomWidthX);
         this.cid = cid;
     }
 

Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java?rev=1805308&r1=1805307&r2=1805308&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java Thu Aug 17 15:56:33 2017
@@ -19,6 +19,7 @@ package org.apache.fontbox.cff;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * This class represents a converter for a mapping into a Type2-sequence.
@@ -53,7 +54,7 @@ public class Type2CharStringParser
     public Type2CharStringParser(String fontName, int cid)
     {
         this.fontName = fontName;
-        this.glyphName = String.format("%04x", cid); // for debugging only
+        this.glyphName = String.format(Locale.US, "%04x", cid); // for debugging only
     }
 
     /**

Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java?rev=1805308&r1=1805307&r2=1805308&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java Thu Aug 17 15:56:33 2017
@@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFac
 import java.awt.geom.GeneralPath;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * This class provides a glyph to GeneralPath conversion for true type fonts.
@@ -152,7 +153,7 @@ class GlyphRenderer
         path.moveTo(point.x, point.y);
         if (LOG.isDebugEnabled())
         {
-            LOG.trace("moveTo: " + String.format("%d,%d", point.x, point.y));
+            LOG.trace("moveTo: " + String.format(Locale.US, "%d,%d", point.x, point.y));
         }
     }
 
@@ -170,7 +171,7 @@ class GlyphRenderer
         path.quadTo(ctrlPoint.x, ctrlPoint.y, point.x, point.y);
         if (LOG.isDebugEnabled())
         {
-            LOG.trace("quadTo: " + String.format("%d,%d %d,%d", ctrlPoint.x, ctrlPoint.y,
+            LOG.trace("quadTo: " + String.format(Locale.US, "%d,%d %d,%d", ctrlPoint.x, ctrlPoint.y,
                     point.x, point.y));
         }
     }
@@ -213,7 +214,7 @@ class GlyphRenderer
         @Override
         public String toString()
         {
-            return String.format("Point(%d,%d,%s,%s)", x, y, onCurve ? "onCurve" : "",
+            return String.format(Locale.US, "Point(%d,%d,%s,%s)", x, y, onCurve ? "onCurve" : "",
                     endOfContour ? "endOfContour" : "");
         }
     }