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 2017/05/07 16:50:11 UTC
svn commit: r1794223 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java
Author: tilman
Date: Sun May 7 16:50:11 2017
New Revision: 1794223
URL: http://svn.apache.org/viewvc?rev=1794223&view=rev
Log:
PDFBOX-3780: favor using path maxY instead of estimate for CapHeight and XHeight when missing in font
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java?rev=1794223&r1=1794222&r2=1794223&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java Sun May 7 16:50:11 2017
@@ -17,6 +17,7 @@
package org.apache.pdfbox.pdmodel.font;
+import java.awt.geom.GeneralPath;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -236,11 +237,26 @@ abstract class TrueTypeEmbedder implemen
}
else
{
- // estimate by summing the typographical +ve ascender and -ve descender
- fd.setCapHeight((os2.getTypoAscender() + os2.getTypoDescender()) * scaling);
-
- // estimate by halving the typographical ascender
- fd.setXHeight(os2.getTypoAscender() / 2.0f * scaling);
+ GeneralPath capHPath = ttf.getPath("H");
+ if (capHPath != null)
+ {
+ fd.setCapHeight(Math.round(capHPath.getBounds2D().getMaxY()) * scaling);
+ }
+ else
+ {
+ // estimate by summing the typographical +ve ascender and -ve descender
+ fd.setCapHeight((os2.getTypoAscender() + os2.getTypoDescender()) * scaling);
+ }
+ GeneralPath xPath = ttf.getPath("x");
+ if (xPath != null)
+ {
+ fd.setXHeight(Math.round(xPath.getBounds2D().getMaxY()) * scaling);
+ }
+ else
+ {
+ // estimate by halving the typographical ascender
+ fd.setXHeight(os2.getTypoAscender() / 2.0f * scaling);
+ }
}
// StemV - there's no true TTF equivalent of this, so we estimate it