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/07 12:29:23 UTC
svn commit: r1755438 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font:
PDSimpleFont.java encoding/DictionaryEncoding.java
Author: tilman
Date: Sun Aug 7 12:29:23 2016
New Revision: 1755438
URL: http://svn.apache.org/viewvc?rev=1755438&view=rev
Log:
PDFBOX-3403: Handle invalid BaseEncoding names + Ignore invalid BaseEncoding names, as done by John Hewson in 2.0
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java?rev=1755438&r1=1755437&r2=1755438&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java Sun Aug 7 12:29:23 2016
@@ -111,7 +111,13 @@ public abstract class PDSimpleFont exten
Encoding builtIn = null;
Boolean symbolic = getSymbolicFlag();
boolean isFlaggedAsSymbolic = symbolic != null && symbolic;
- if (!encodingDict.containsKey(COSName.BASE_ENCODING) && isFlaggedAsSymbolic)
+
+ COSName baseEncoding = encodingDict.getCOSName(COSName.BASE_ENCODING);
+
+ boolean hasValidBaseEncoding = baseEncoding != null &&
+ Encoding.getInstance(baseEncoding) != null;
+
+ if (!hasValidBaseEncoding && isFlaggedAsSymbolic)
{
builtIn = readEncodingFromFont();
}
@@ -142,7 +148,7 @@ public abstract class PDSimpleFont exten
glyphList = GlyphList.getAdobeGlyphList();
}
}
-
+
/**
* Called by readEncoding() if the encoding needs to be extracted from the font file.
*
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java?rev=1755438&r1=1755437&r2=1755438&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/DictionaryEncoding.java Sun Aug 7 12:29:23 2016
@@ -19,6 +19,8 @@ package org.apache.pdfbox.pdmodel.font.e
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -32,6 +34,8 @@ import org.apache.pdfbox.cos.COSNumber;
*/
public class DictionaryEncoding extends Encoding
{
+ private static final Log LOG = LogFactory.getLog(DictionaryEncoding.class);
+
private final COSDictionary encoding;
private final Encoding baseEncoding;
private final Map<Integer, String> differences = new HashMap<Integer, String>();
@@ -91,10 +95,11 @@ public class DictionaryEncoding extends
encoding = fontEncoding;
Encoding base = null;
- if (encoding.containsKey(COSName.BASE_ENCODING))
+ boolean hasBaseEncoding = encoding.containsKey(COSName.BASE_ENCODING);
+ if (hasBaseEncoding)
{
COSName name = encoding.getCOSName(COSName.BASE_ENCODING);
- base = Encoding.getInstance(name); // may be null
+ base = Encoding.getInstance(name); // null when the name is invalid
}
if (base == null)
@@ -113,6 +118,8 @@ public class DictionaryEncoding extends
}
else
{
+ // triggering this error indicates a bug in PDFBox. Every font should always have
+ // a built-in encoding, if not, we parsed it incorrectly.
throw new IllegalArgumentException("Symbolic fonts must have a built-in " +
"encoding");
}