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 2022/08/16 03:53:58 UTC

svn commit: r1903447 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java

Author: tilman
Date: Tue Aug 16 03:53:58 2022
New Revision: 1903447

URL: http://svn.apache.org/viewvc?rev=1903447&view=rev
Log:
PDFBOX-4892: optimize, as suggested by Valery Bokov

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

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1903447&r1=1903446&r2=1903447&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Tue Aug 16 03:53:58 2022
@@ -546,7 +546,7 @@ public abstract class PDFont implements
         {
             try
             {
-                if (dict.containsKey(COSName.TO_UNICODE) && toUnicodeCMap != null)
+                if (toUnicodeCMap != null && dict.containsKey(COSName.TO_UNICODE))
                 {
                     int spaceMapping = toUnicodeCMap.getSpaceMapping();
                     if (spaceMapping > -1)
@@ -563,11 +563,11 @@ public abstract class PDFont implements
                 if (fontWidthOfSpace <= 0)
                 {
                     fontWidthOfSpace = getWidthFromFont(32);
-                }
-                // use the average font width as fall back
-                if (fontWidthOfSpace <= 0)
-                {
-                    fontWidthOfSpace = getAverageFontWidth();
+                    // use the average font width as fall back
+                    if (fontWidthOfSpace <= 0)
+                    {
+                        fontWidthOfSpace = getAverageFontWidth();
+                    }
                 }
             }
             catch (Exception e)