svn commit: r1705805 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java

[ti...@apache.org]

Author: tilman
Date: Tue Sep 29 07:38:50 2015
New Revision: 1705805

URL: http://svn.apache.org/viewvc?rev=1705805&view=rev
Log:
PDFBOX-2943: avoid NPE when charproc missing

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

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java?rev=1705805&r1=1705804&r2=1705805&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java Tue Sep 29 07:38:50 2015
@@ -19,6 +19,8 @@ package org.apache.pdfbox.pdmodel.font;
 import java.awt.geom.GeneralPath;
 import java.io.IOException;
 import java.io.InputStream;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.fontbox.FontBoxFont;
 import org.apache.fontbox.util.BoundingBox;
 import org.apache.pdfbox.cos.COSArray;
@@ -40,6 +42,8 @@ import org.apache.pdfbox.util.Vector;
  */
 public class PDType3Font extends PDSimpleFont
 {
+    private static final Log LOG = LogFactory.getLog(PDType3Font.class);
+
     private PDResources resources;
     private COSDictionary charProcs;
     private Matrix fontMatrix;
@@ -127,6 +131,7 @@ public class PDType3Font extends PDSimpl
             }
             else
             {
+                LOG.warn("No width for glyph " + code + " in font " + getName() + ", using width from font");
                 return getWidthFromFont(code);
             }
         }
@@ -135,7 +140,13 @@ public class PDType3Font extends PDSimpl
     @Override
     public float getWidthFromFont(int code) throws IOException
     {
-        return getCharProc(code).getWidth();
+        PDType3CharProc charProc = getCharProc(code);
+        if (charProc == null)
+        {
+            LOG.warn("No CharProc for glyph " + code + " found, returning 0");
+            return 0;
+        }
+        return charProc.getWidth();
     }
 
     @Override