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/03/04 19:39:24 UTC
svn commit: r1887184 - in
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox: cff/CFFParser.java
ttf/TrueTypeFont.java
Author: tilman
Date: Thu Mar 4 19:39:24 2021
New Revision: 1887184
URL: http://svn.apache.org/viewvc?rev=1887184&view=rev
Log:
PDFBOX-4892: remove redundant type conversion, as suggested by valerybokov
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java?rev=1887184&r1=1887183&r2=1887184&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java Thu Mar 4 19:39:24 2021
@@ -444,11 +444,13 @@ public class CFFParser
boolean isCIDFont = topDict.getEntry("ROS") != null;
if (isCIDFont)
{
- font = new CFFCIDFont();
+ CFFCIDFont cffCIDFont = new CFFCIDFont();
DictData.Entry rosEntry = topDict.getEntry("ROS");
- ((CFFCIDFont) font).setRegistry(readString(rosEntry.getNumber(0).intValue()));
- ((CFFCIDFont) font).setOrdering(readString(rosEntry.getNumber(1).intValue()));
- ((CFFCIDFont) font).setSupplement(rosEntry.getNumber(2).intValue());
+ cffCIDFont.setRegistry(readString(rosEntry.getNumber(0).intValue()));
+ cffCIDFont.setOrdering(readString(rosEntry.getNumber(1).intValue()));
+ cffCIDFont.setSupplement(rosEntry.getNumber(2).intValue());
+
+ font = cffCIDFont;
}
else
{
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java?rev=1887184&r1=1887183&r2=1887184&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java Thu Mar 4 19:39:24 2021
@@ -717,10 +717,11 @@ public class TrueTypeFont implements Fon
@Override
public BoundingBox getFontBBox() throws IOException
{
- short xMin = getHeader().getXMin();
- short xMax = getHeader().getXMax();
- short yMin = getHeader().getYMin();
- short yMax = getHeader().getYMax();
+ HeaderTable headerTable = getHeader();
+ short xMin = headerTable.getXMin();
+ short xMax = headerTable.getXMax();
+ short yMin = headerTable.getYMin();
+ short yMax = headerTable.getYMax();
float scale = 1000f / getUnitsPerEm();
return new BoundingBox(xMin * scale, yMin * scale, xMax * scale, yMax * scale);
}