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 2018/05/23 17:16:11 UTC
svn commit: r1832111 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
Author: tilman
Date: Wed May 23 17:16:10 2018
New Revision: 1832111
URL: http://svn.apache.org/viewvc?rev=1832111&view=rev
Log:
PDFBOX-4228: fix ClassCastException and bug that prevented the use of a name for encoding in type3 fonts, by Daniel Persson
Modified:
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/PDType3Font.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java?rev=1832111&r1=1832110&r2=1832111&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 Wed May 23 17:16:10 2018
@@ -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;
@@ -41,6 +43,11 @@ import org.apache.pdfbox.util.Vector;
*/
public class PDType3Font extends PDSimpleFont
{
+ /**
+ * Log instance.
+ */
+ private static final Log LOG = LogFactory.getLog(PDType3Font.class);
+
private PDResources resources;
private COSDictionary charProcs;
private Matrix fontMatrix;
@@ -66,8 +73,20 @@ public class PDType3Font extends PDSimpl
@Override
protected final void readEncoding() throws IOException
{
- COSDictionary encodingDict = (COSDictionary)dict.getDictionaryObject(COSName.ENCODING);
- encoding = new DictionaryEncoding(encodingDict);
+ COSBase encodingBase = dict.getDictionaryObject(COSName.ENCODING);
+ if (encodingBase instanceof COSName)
+ {
+ COSName encodingName = (COSName) encodingBase;
+ encoding = Encoding.getInstance(encodingName);
+ if (encoding == null)
+ {
+ LOG.warn("Unknown encoding: " + encodingName.getName());
+ }
+ }
+ else if (encodingBase instanceof COSDictionary)
+ {
+ encoding = new DictionaryEncoding((COSDictionary) encodingBase);
+ }
glyphList = GlyphList.getAdobeGlyphList();
}