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 2015/01/23 22:07:01 UTC

svn commit: r1654384 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java

Author: tilman
Date: Fri Jan 23 21:07:00 2015
New Revision: 1654384

URL: http://svn.apache.org/r1654384
Log:
PDFBOX-2576: merge if statements

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

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1654384&r1=1654383&r2=1654384&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Fri Jan 23 21:07:00 2015
@@ -440,15 +440,12 @@ public class PDType1Font extends PDSimpl
             {
                 // try unicode name
                 String unicodes = getGlyphList().toUnicode(name);
-                if (unicodes != null)
+                if (unicodes != null && unicodes.length() == 1)
                 {
-                    if (unicodes.length() == 1)
+                    String uniName = String.format("uni%04X", unicodes.codePointAt(0));
+                    if (type1Equivalent.hasGlyph(uniName))
                     {
-                        String uniName = String.format("uni%04X", unicodes.codePointAt(0));
-                        if (type1Equivalent.hasGlyph(uniName))
-                        {
-                            return uniName;
-                        }
+                        return uniName;
                     }
                 }
             }