svn commit: r1631017 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font: PDCIDFont.java PDFont.java PDSimpleFont.java PDType1Font.java

[jahewson]

Author: jahewson
Date: Sat Oct 11 04:40:35 2014
New Revision: 1631017

URL: http://svn.apache.org/r1631017
Log:
PDFBOX-2399: Call PDFont super constructor for standard 14 PDType1Fonts, and 
make superconst

Modified:
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.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/PDCIDFont.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java?rev=1631017&r1=1631016&r2=1631017&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java 
(original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java 
Sat Oct 11 04:40:35 2014
@@ -57,7 +57,7 @@ public abstract class PDCIDFont implemen
      *
      * @param fontDictionary The font dictionary according to the PDF 
specification.
      */
-    protected PDCIDFont(COSDictionary fontDictionary, PDType0Font parent) 
throws IOException
+    PDCIDFont(COSDictionary fontDictionary, PDType0Font parent) throws 
IOException
     {
         this.dict = fontDictionary;
         this.parent = parent;

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1631017&r1=1631016&r2=1631017&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java 
(original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java 
Sat Oct 11 04:40:35 2014
@@ -62,7 +62,7 @@ public abstract class PDFont implements 
     /**
      * Constructor for embedding.
      */
-    protected PDFont()
+    PDFont()
     {
         dict = new COSDictionary();
         dict.setItem(COSName.TYPE, COSName.FONT);
@@ -74,16 +74,16 @@ public abstract class PDFont implements 
     /**
      * Constructor for Standard 14.
      */
-    protected PDFont(String baseFont)
+    PDFont(String baseFont)
     {
         dict = new COSDictionary();
         toUnicodeCMap = null;
-        fontDescriptor = null;
-        afmStandard14 = Standard14Fonts.getAFM(getName()); // may be null (it 
usually is)
+        afmStandard14 = Standard14Fonts.getAFM(baseFont);
         if (afmStandard14 == null)
         {
             throw new IllegalArgumentException("No AFM for font " + baseFont);
         }
+        fontDescriptor = 
PDType1FontEmbedder.buildFontDescriptor(afmStandard14);
     }
 
     /**

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java?rev=1631017&r1=1631016&r2=1631017&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
 Sat Oct 11 04:40:35 2014
@@ -48,17 +48,25 @@ public abstract class PDSimpleFont exten
     /**
      * Constructor
      */
-    protected PDSimpleFont()
+    PDSimpleFont()
     {
         super();
     }
 
     /**
+     * Constructor for Standard 14.
+     */
+    PDSimpleFont(String baseFont)
+    {
+        super(baseFont);
+    }
+
+    /**
      * Constructor.
      *
      * @param fontDictionary Font dictionary.
      */
-    protected PDSimpleFont(COSDictionary fontDictionary) throws IOException
+    PDSimpleFont(COSDictionary fontDictionary) throws IOException
     {
         super(fontDictionary);
     }

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=1631017&r1=1631016&r2=1631017&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
 Sat Oct 11 04:40:35 2014
@@ -94,6 +94,8 @@ public class PDType1Font extends PDSimpl
      */
     private PDType1Font(String baseFont)
     {
+        super(baseFont);
+        
         dict.setItem(COSName.SUBTYPE, COSName.TYPE1);
         dict.setName(COSName.BASE_FONT, baseFont);
         encoding = new WinAnsiEncoding();