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 10:06:15 UTC

svn commit: r1799007 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java

Author: tilman
Date: Sat Jun 17 10:06:14 2017
New Revision: 1799007

URL: http://svn.apache.org/viewvc?rev=1799007&view=rev
Log:
PDFBOX-3515: refactor

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java?rev=1799007&r1=1799006&r2=1799007&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java Sat Jun 17 10:06:14 2017
@@ -131,16 +131,17 @@ public class PDCIDFontType0 extends PDCI
             FontBoxFont font;
             if (mapping.isCIDFont())
             {
-                if (mapping.getFont().getCFF().getFont() instanceof CFFCIDFont)
+                cffFont = mapping.getFont().getCFF().getFont();
+                if (cffFont instanceof CFFCIDFont)
                 {
-                    cidFont = (CFFCIDFont) mapping.getFont().getCFF().getFont();
+                    cidFont = (CFFCIDFont) cffFont;
                     t1Font = null;
                     font = cidFont;
                 }
                 else
                 {
                     // PDFBOX-3515: OpenType fonts are loaded as CFFType1Font
-                    CFFType1Font f = (CFFType1Font) mapping.getFont().getCFF().getFont();
+                    CFFType1Font f = (CFFType1Font) cffFont;
                     cidFont = null;
                     t1Font = f;
                     font = f;