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/05/09 13:26:43 UTC
svn commit: r1742945 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java
Author: tilman
Date: Mon May 9 13:26:43 2016
New Revision: 1742945
URL: http://svn.apache.org/viewvc?rev=1742945&view=rev
Log:
PDFBOX-3344: avoid ClassCastException
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java?rev=1742945&r1=1742944&r2=1742945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java Mon May 9 13:26:43 2016
@@ -30,8 +30,6 @@ import java.util.Map;
import java.util.PriorityQueue;
import java.util.Set;
import org.apache.fontbox.FontBoxFont;
-import org.apache.fontbox.cff.CFFFont;
-import org.apache.fontbox.cff.CFFType1Font;
import org.apache.fontbox.ttf.OpenTypeFont;
import org.apache.fontbox.ttf.TTFParser;
import org.apache.fontbox.ttf.TrueTypeFont;
@@ -381,10 +379,10 @@ final class FontMapperImpl implements Fo
return t1;
}
- CFFFont cff = (CFFFont)findFont(FontFormat.OTF, postScriptName);
- if (cff instanceof CFFType1Font)
+ OpenTypeFont otf = (OpenTypeFont) findFont(FontFormat.OTF, postScriptName);
+ if (otf instanceof OpenTypeFont)
{
- return cff;
+ return otf;
}
TrueTypeFont ttf = (TrueTypeFont)findFont(FontFormat.TTF, postScriptName);