Adjust to the PDFT1Stream being an AbstractPDFStream now.

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

diff --git a/src/java/org/apache/fop/pdf/PDFFactory.java b/src/java/org/apache/fop/pdf/PDFFactory.java
index cee35861ba598781c590d9e58e35f8951577931b..ceeba8915af60b1f3dd3e1bc7bdc311cc7b90805 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFFactory.java
+++ b/src/java/org/apache/fop/pdf/PDFFactory.java
@@ -1078,7 +1078,7 @@ public class PDFFactory {
 
         // Check if the font is embeddable
         if (desc.isEmbeddable()) {
-            PDFStream stream = makeFontFile(desc);
+            AbstractPDFStream stream = makeFontFile(desc);
             if (stream != null) {
                 descriptor.setFontFile(desc.getFontType(), stream);
                 getDocument().registerObject(stream);
@@ -1092,7 +1092,7 @@ public class PDFFactory {
      * @param desc FontDescriptor of the font.
      * @return PDFStream The embedded font file
      */
-    public PDFStream makeFontFile(FontDescriptor desc) {
+    public AbstractPDFStream makeFontFile(FontDescriptor desc) {
         if (desc.getFontType() == FontType.OTHER) {
             throw new IllegalArgumentException("Trying to embed unsupported font type: "
                                                 + desc.getFontType());
@@ -1142,7 +1142,7 @@ public class PDFFactory {
                 return null;
             } else {
                 try {
-                    PDFStream embeddedFont;
+                    AbstractPDFStream embeddedFont;
                     if (desc.getFontType() == FontType.TYPE0) {
                         MultiByteFont mbfont = (MultiByteFont)font;
                         FontFileReader reader = new FontFileReader(in);

diff --git a/src/java/org/apache/fop/pdf/PDFFontDescriptor.java b/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
index a91d509c2f4a134a1196c07d6fe3a1e8b52b271b..804d700395adc86b1c792f443f11729a97c46cf6 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
+++ b/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
@@ -75,7 +75,7 @@ public class PDFFontDescriptor extends PDFObject {
     private int avgWidth = 0;
     private int maxWidth = 0;
     private int missingWidth = 0;
-    private PDFStream fontfile;
+    private AbstractPDFStream fontfile;
     // private String charSet = null;
 
     private FontType subtype;
@@ -141,7 +141,7 @@ public class PDFFontDescriptor extends PDFObject {
      * @param subtype the font type defined in the font stream
      * @param fontfile the stream containing an embedded font
      */
-    public void setFontFile(FontType subtype, PDFStream fontfile) {
+    public void setFontFile(FontType subtype, AbstractPDFStream fontfile) {
         this.subtype = subtype;
         this.fontfile = fontfile;
     }