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 2020/06/18 15:36:57 UTC
svn commit: r1878964 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font:
PDType0Font.java PDType1Font.java
Author: tilman
Date: Thu Jun 18 15:36:57 2020
New Revision: 1878964
URL: http://svn.apache.org/viewvc?rev=1878964&view=rev
Log:
PDFBOX-4071: DRY refactoring
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1878964&r1=1878963&r2=1878964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java Thu Jun 18 15:36:57 2020
@@ -158,7 +158,7 @@ public class PDType0Font extends PDFont
*/
public static PDType0Font load(PDDocument doc, InputStream input) throws IOException
{
- return new PDType0Font(doc, new TTFParser().parse(input), true, true, false);
+ return load(doc, input, true);
}
/**
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=1878964&r1=1878963&r2=1878964&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 Thu Jun 18 15:36:57 2020
@@ -175,15 +175,7 @@ public class PDType1Font extends PDSimpl
*/
public PDType1Font(PDDocument doc, InputStream pfbIn) throws IOException
{
- PDType1FontEmbedder embedder = new PDType1FontEmbedder(doc, dict, pfbIn, null);
- encoding = embedder.getFontEncoding();
- glyphList = embedder.getGlyphList();
- type1font = embedder.getType1Font();
- genericFont = embedder.getType1Font();
- isEmbedded = true;
- isDamaged = false;
- fontMatrixTransform = new AffineTransform();
- codeToBytesMap = new HashMap<>();
+ this(doc, pfbIn, null);
}
/**
@@ -197,7 +189,7 @@ public class PDType1Font extends PDSimpl
public PDType1Font(PDDocument doc, InputStream pfbIn, Encoding encoding) throws IOException
{
PDType1FontEmbedder embedder = new PDType1FontEmbedder(doc, dict, pfbIn, encoding);
- this.encoding = encoding;
+ this.encoding = encoding == null ? embedder.getFontEncoding() : encoding;
glyphList = embedder.getGlyphList();
type1font = embedder.getType1Font();
genericFont = embedder.getType1Font();