You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2015/06/29 22:59:18 UTC
svn commit: r1688305 - in /pdfbox/trunk:
fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Author: jahewson
Date: Mon Jun 29 20:59:17 2015
New Revision: 1688305
URL: http://svn.apache.org/r1688305
Log:
PDFBOX-2842: Use the FontMatrix when calculating widths in getWidthFromFont()
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
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=1688305&r1=1688304&r2=1688305&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 Mon Jun 29 20:59:17 2015
@@ -621,14 +621,7 @@ public class TrueTypeFont implements Fon
public float getWidth(String name) throws IOException
{
Integer gid = nameToGID(name);
-
- int width = getAdvanceWidth(gid);
- int unitsPerEM = getUnitsPerEm();
- if (unitsPerEM != 1000)
- {
- width *= 1000f / unitsPerEM;
- }
- return width;
+ return getAdvanceWidth(gid);
}
@Override
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=1688305&r1=1688304&r2=1688305&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 Mon Jun 29 20:59:17 2015
@@ -16,7 +16,9 @@
*/
package org.apache.pdfbox.pdmodel.font;
+import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@@ -87,6 +89,7 @@ public class PDType1Font extends PDSimpl
private final boolean isEmbedded;
private final boolean isDamaged;
private Matrix fontMatrix;
+ private final AffineTransform fontMatrixTransform;
/**
* Creates a Type 1 standard 14 font for embedding.
@@ -123,6 +126,7 @@ public class PDType1Font extends PDSimpl
}
isEmbedded = false;
isDamaged = false;
+ fontMatrixTransform = new AffineTransform();
}
/**
@@ -141,6 +145,7 @@ public class PDType1Font extends PDSimpl
genericFont = embedder.getType1Font();
isEmbedded = true;
isDamaged = false;
+ fontMatrixTransform = new AffineTransform();
}
/**
@@ -228,6 +233,8 @@ public class PDType1Font extends PDSimpl
}
}
readEncoding();
+ fontMatrixTransform = getFontMatrix().createAffineTransform();
+ fontMatrixTransform.scale(1000, 1000);
}
/**
@@ -325,8 +332,11 @@ public class PDType1Font extends PDSimpl
{
return 250;
}
+ float width = genericFont.getWidth(name);
- return genericFont.getWidth(name);
+ Point2D p = new Point2D.Float(width, 0);
+ fontMatrixTransform.transform(p, p);
+ return (float)p.getX();
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1688305&r1=1688304&r2=1688305&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Mon Jun 29 20:59:17 2015
@@ -367,7 +367,6 @@ public class PageDrawer extends PDFGraph
Math.abs(fontWidth - displacement.getX() * 1000) > 0.0001)
{
float pdfWidth = displacement.getX() * 1000;
- pdfWidth *= font.getFontMatrix().getScalingFactorX() * 1000;
at.scale(pdfWidth / fontWidth, 1);
}
}