You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2016/08/02 16:12:12 UTC
svn commit: r1754971 - in
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font:
PDFont.java PDType3Font.java
Author: tilman
Date: Tue Aug 2 16:12:12 2016
New Revision: 1754971
URL: http://svn.apache.org/viewvc?rev=1754971&view=rev
Log:
PDFBOX-3448: convert null elements of /WIDTHS array to 0
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1754971&r1=1754970&r2=1754971&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Tue Aug 2 16:12:12 2016
@@ -249,6 +249,10 @@ public abstract class PDFont implements
if (siz > 0 && code >= firstChar && code <= lastChar && idx < siz)
{
width = getWidths().get(idx);
+ if (width == null)
+ {
+ width = 0f;
+ }
codeToWidthMap.put(code, width);
return width;
}
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java?rev=1754971&r1=1754970&r2=1754971&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java Tue Aug 2 16:12:12 2016
@@ -118,7 +118,8 @@ public class PDType3Font extends PDSimpl
int lastChar = dict.getInt(COSName.LAST_CHAR, -1);
if (getWidths().size() > 0 && code >= firstChar && code <= lastChar)
{
- return getWidths().get(code - firstChar);
+ Float w = getWidths().get(code - firstChar);
+ return w == null ? 0 : w;
}
else
{