svn commit: r1614391 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java

[ti...@apache.org]

Author: tilman
Date: Tue Jul 29 15:52:24 2014
New Revision: 1614391

URL: http://svn.apache.org/r1614391
Log:
PDFBOX-2166: Treat a font with only one with as monospaced even if fixedPitch flag isn't set

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=1614391&r1=1614390&r2=1614391&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Tue Jul 29 15:52:24 2014
@@ -86,7 +86,7 @@ public class PDTrueTypeFont extends PDFo
     private boolean cmapInitialized = false;
 
     private TrueTypeFont ttf = null;
-    private HashMap<Integer, Float> advanceWidths = new HashMap<Integer, Float> ();
+    private final HashMap<Integer, Float> advanceWidths = new HashMap<Integer, Float> ();
 
     /**
      * Creates a new TrueType font from a Font dictionary.
@@ -307,7 +307,7 @@ public class PDTrueTypeFont extends PDFo
         int[] widthValues = hMet.getAdvanceWidth();
         // some monospaced fonts provide only one value for the width
         // instead of an array containing the same value for every glyphid
-        boolean isMonospaced = fd.isFixedPitch();
+        boolean isMonospaced = fd.isFixedPitch() || widthValues.length == 1;
         int nWidths = lastChar - firstChar + 1;
         List<Integer> widths = new ArrayList<Integer>(nWidths);
         // use the first width as default