Author: tilman
Date: Sun Jun 11 12:30:30 2017
New Revision: 1798360
URL: http://svn.apache.org/viewvc?rev=1798360&view=rev
Log:
PDFBOX-3824: move check that embedding is authorized in correct (other) constructor; remove boolean parameter that isn't used
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java?rev=1798360&r1=1798359&r2=1798360&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFontEmbedder.java Sun Jun 11 12:30:30 2017
@@ -53,7 +53,7 @@ final class PDTrueTypeFontEmbedder exten
PDTrueTypeFontEmbedder(PDDocument document, COSDictionary dict, InputStream ttfStream,
Encoding encoding) throws IOException
{
- super(document, dict, ttfStream, false);
+ super(document, dict, ttfStream);
dict.setItem(COSName.SUBTYPE, COSName.TRUE_TYPE);
GlyphList glyphList = GlyphList.getAdobeGlyphList();
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java?rev=1798360&r1=1798359&r2=1798360&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java Sun Jun 11 12:30:30 2017
@@ -62,21 +62,15 @@ abstract class TrueTypeEmbedder implemen
private final boolean embedSubset;
/**
- * Creates a new TrueType font for embedding.
+ * Creates a new TrueType font for full embedding.
*/
- TrueTypeEmbedder(PDDocument document, COSDictionary dict, InputStream ttfStream,
- boolean embedSubset) throws IOException
+ TrueTypeEmbedder(PDDocument document, COSDictionary dict, InputStream ttfStream) throws IOException
{
this.document = document;
- this.embedSubset = embedSubset;
+ this.embedSubset = false;
buildFontFile2(ttfStream);
- if (!isEmbeddingPermitted(ttf))
- {
- throw new IOException("This font does not permit embedding");
- }
-
dict.setName(COSName.BASE_FONT, ttf.getName());
// choose a Unicode "cmap"
@@ -94,6 +88,11 @@ abstract class TrueTypeEmbedder implemen
this.ttf = ttf;
fontDescriptor = createFontDescriptor(ttf);
+ if (!isEmbeddingPermitted(ttf))
+ {
+ throw new IOException("This font does not permit embedding");
+ }
+
if (!embedSubset)
{
// full embedding