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 2017/06/17 08:06:59 UTC
svn commit: r1798995 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
Author: tilman
Date: Sat Jun 17 08:06:59 2017
New Revision: 1798995
URL: http://svn.apache.org/viewvc?rev=1798995&view=rev
Log:
PDFBOX-3515: accept a Type 1-Equivalent CFF font too, as suggested by Esteban Nicolas Ruiz
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java?rev=1798995&r1=1798994&r2=1798995&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java Sat Jun 17 08:06:59 2017
@@ -130,9 +130,20 @@ public class PDCIDFontType0 extends PDCI
FontBoxFont font;
if (mapping.isCIDFont())
{
- cidFont = (CFFCIDFont)mapping.getFont().getCFF().getFont();
- t1Font = null;
- font = cidFont;
+ if (mapping.getFont().getCFF().getFont() instanceof CFFCIDFont)
+ {
+ cidFont = (CFFCIDFont) mapping.getFont().getCFF().getFont();
+ t1Font = null;
+ font = cidFont;
+ }
+ else
+ {
+ // PDFBOX-3515: OpenType fonts are loaded as CFFType1Font
+ CFFType1Font f = (CFFType1Font) mapping.getFont().getCFF().getFont();
+ cidFont = null;
+ t1Font = f;
+ font = f;
+ }
}
else
{