The PDF object number doesn't get passed to the constructor anymore. Adjust for that.

Use the toPDFString() (returns String) method instead of toPDF() (returns byte[]) where appropriate. String to byte[] conversion is done in PDFObject in a well-defined location instead of scattered around the codebase.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196159 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/pdf/PDFFontNonBase14.java b/src/java/org/apache/fop/pdf/PDFFontNonBase14.java
index 766e54d45..35b048e04 100644
--- a/src/java/org/apache/fop/pdf/PDFFontNonBase14.java
+++ b/src/java/org/apache/fop/pdf/PDFFontNonBase14.java
@@ -81,18 +81,17 @@ public abstract class PDFFontNonBase14 extends PDFFont {
     /**
      * Create the /Font object
      *
-     * @param number the object's number
      * @param fontname the internal name for the font
      * @param subtype the font's subtype
      * @param basefont the base font name
      * @param encoding the character encoding schema used by the font
      */
-    public PDFFontNonBase14(int number, String fontname, FontType subtype,
+    public PDFFontNonBase14(String fontname, FontType subtype,
                             String basefont,
                             Object encoding) {
 
         /* generic creation of PDF object */
-        super(number, fontname, subtype, basefont, encoding);
+        super(fontname, subtype, basefont, encoding);
 
         this.descriptor = null;
     }