You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2013/05/02 20:21:40 UTC

svn commit: r1478472 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java

Author: lehmi
Date: Thu May  2 18:21:39 2013
New Revision: 1478472

URL: http://svn.apache.org/r1478472
Log:
PDFBOX-1580: rearranged code to avoid unneeded calls

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1478472&r1=1478471&r2=1478472&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java Thu May  2 18:21:39 2013
@@ -87,23 +87,23 @@ public class PDType0Font extends PDSimpl
             if (descendantFont != null)
             {
                 awtFont = ((PDSimpleFont)descendantFont).getawtFont();
+                if (awtFont != null)
+                {
+                    setIsFontSubstituted(((PDSimpleFont)descendantFont).isFontSubstituted());
+                    /*
+                     * Fix Oracle JVM Crashes.
+                     * Tested with Oracle JRE 6.0_45-b06 and 7.0_21-b11
+                     */
+                    awtFont.canDisplay(1);
+                }
             }
-            if (awtFont != null)
-            {
-                setIsFontSubstituted(((PDSimpleFont)descendantFont).isFontSubstituted());
-            }
-            else
+            if (awtFont == null)
             {
                 awtFont = FontManager.getStandardFont();
                 LOG.info("Using font "+awtFont.getName()
                         + " instead of "+descendantFont.getFontDescriptor().getFontName());
                 setIsFontSubstituted(true);
             }
-            /*
-             * Fix Oracle JVM Crashes.
-             * Tested with Oracle JRE 6.0_45-b06 and 7.0_21-b11
-             */
-            awtFont.canDisplay(1);
         }
         return awtFont;
     }