Author: tilman
Date: Wed Dec 30 16:28:20 2015
New Revision: 1722375
URL: http://svn.apache.org/viewvc?rev=1722375&view=rev
Log:
PDFBOX-3175, PDFBOX-2508, PDFBOX-3062: fix height calculations analog to rev
1711701, font matrix is to be used only for type3 fonts
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java?rev=1722375&r1=1722374&r2=1722375&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java
Wed Dec 30 16:28:20 2015
@@ -169,7 +169,15 @@ class PDFTextStreamEngine extends PDFStr
}
// transformPoint from glyph space -> text space
- float height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
+ float height;
+ if (font instanceof PDType3Font)
+ {
+ height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
+ }
+ else
+ {
+ height = glyphHeight / 1000;
+ }
// (modified) combined displacement, this is calculated *without*
taking the character
// spacing and word spacing into account, due to legacy code in
TextStripper
