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:54:06 UTC
svn commit: r1903448 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
Author: tilman
Date: Tue Aug 16 03:54:06 2022
New Revision: 1903448
URL: http://svn.apache.org/viewvc?rev=1903448&view=rev
Log:
PDFBOX-4892: optimize, as suggested by Valery Bokov
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1903448&r1=1903447&r2=1903448&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Tue Aug 16 03:54:06 2022
@@ -535,10 +535,9 @@ public abstract class PDFont implements
{
if (fontWidthOfSpace == -1f)
{
- COSBase toUnicode = dict.getDictionaryObject(COSName.TO_UNICODE);
try
{
- if (toUnicode != null && toUnicodeCMap != null)
+ if (toUnicodeCMap != null && dict.containsKey(COSName.TO_UNICODE))
{
int spaceMapping = toUnicodeCMap.getSpaceMapping();
if (spaceMapping > -1)
@@ -555,11 +554,12 @@ 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)