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 2021/10/02 13:23:49 UTC
svn commit: r1893820 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
Author: tilman
Date: Sat Oct 2 13:23:49 2021
New Revision: 1893820
URL: http://svn.apache.org/viewvc?rev=1893820&view=rev
Log:
PDFBOX-4892: optimize + remove unneeded code, as suggested by valerybokov
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=1893820&r1=1893819&r2=1893820&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 Sat Oct 2 13:23:49 2021
@@ -221,7 +221,7 @@ public class PDType1Font extends PDSimpl
length1 = repairLength1(bytes, length1);
length2 = repairLength2(bytes, length1, length2);
- if (bytes.length > 0 && (bytes[0] & 0xff) == PFB_START_MARKER)
+ if ((bytes[0] & 0xff) == PFB_START_MARKER)
{
// some bad files embed the entire PFB, see PDFBOX-2607
t1 = Type1Font.createWithPFB(bytes);
@@ -374,7 +374,6 @@ public class PDType1Font extends PDSimpl
@Override
public float getHeight(int code) throws IOException
{
- String name = codeToName(code);
if (getStandard14AFM() != null)
{
String afmName = getEncoding().getName(code);
@@ -382,6 +381,8 @@ public class PDType1Font extends PDSimpl
}
else
{
+ String name = codeToName(code);
+
// todo: should be scaled by font matrix
return (float) genericFont.getPath(name).getBounds().getHeight();
}