Adjust to the PDF Stream changes.

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

3 files changed, 176 insertions, 137 deletions

diff --git a/src/java/org/apache/fop/pdf/PDFFormXObject.java b/src/java/org/apache/fop/pdf/PDFFormXObject.java
index 8907945f6..a483240b2 100644
--- a/src/java/org/apache/fop/pdf/PDFFormXObject.java
+++ b/src/java/org/apache/fop/pdf/PDFFormXObject.java
@@ -68,13 +68,12 @@ public class PDFFormXObject extends PDFXObject {
      * create a FormXObject with the given number and name and load the
      * image in the object
      *
-     * @param number the pdf object number
      * @param xnumber the pdf object X number
      * @param cont the pdf stream contents
      * @param ref the resource PDF reference
      */
-    public PDFFormXObject(int number, int xnumber, PDFStream cont, String ref) {
-        super(number, xnumber, null);
+    public PDFFormXObject(int xnumber, PDFStream cont, String ref) {
+        super(xnumber, null);
         contents = cont;
         resRef = ref;
     }
@@ -91,36 +90,50 @@ public class PDFFormXObject extends PDFXObject {
     protected int output(OutputStream stream) throws IOException {
         int length = 0;
 
-        String dictEntries = contents.applyFilters();
+        String dictEntries = getFilterList().buildFilterDictEntries();
 
-        String p = this.number + " " + this.generation + " obj\n";
-        p = p + "<</Type /XObject\n";
-        p = p + "/Subtype /Form\n";
-        p = p + "/FormType 1\n";
-        p = p + "/BBox [0 0 1000 1000]\n";
-        p = p + "/Matrix [1 0 0 1 0 0]\n";
-        p = p + "/Resources " + resRef + "\n";
-        p = p + "/Length " + (contents.getDataLength() + 1) + "\n";
+        final StreamCache encodedStream = encodeStream();        
 
-        p = p + dictEntries;
-        p = p + ">>\n";
+        StringBuffer sb = new StringBuffer(128);
+        sb.append(getObjectID());
+        sb.append("<</Type /XObject\n");
+        sb.append("/Subtype /Form\n");
+        sb.append("/FormType 1\n");
+        sb.append("/BBox [0 0 1000 1000]\n");
+        sb.append("/Matrix [1 0 0 1 0 0]\n");
+        sb.append("/Resources " + resRef + "\n");
+        sb.append("/Length " + (encodedStream.getSize() + 1) + "\n");
+
+        sb.append(dictEntries);
+        sb.append(">>\n");
 
         // push the pdf dictionary on the writer
-        byte[] pdfBytes = p.getBytes();
+        byte[] pdfBytes = encode(sb.toString());
         stream.write(pdfBytes);
         length += pdfBytes.length;
-        // push all the image data on the writer
-        // and takes care of length for trailer
-        length += contents.outputStreamData(stream);
 
-        pdfBytes = ("endobj\n").getBytes();
+        //Send encoded stream to target OutputStream
+        length += outputStreamData(encodedStream, stream);
+        encodedStream.clear(); //Encoded stream can now be discarded
+
+        pdfBytes = encode("endobj\n");
         stream.write(pdfBytes);
         length += pdfBytes.length;
+        
         // let it gc
         // this object is retained as a reference to inserting
         // the same image but the image data is no longer needed
         contents = null;
         return length;
     }
+    
+    /**
+     * @see org.apache.fop.pdf.PDFStream#outputRawStreamData(OutputStream)
+     */
+    protected void outputRawStreamData(OutputStream out) throws IOException {
+        contents.outputRawStreamData(out);
+    }
+
+    
 }
 
diff --git a/src/java/org/apache/fop/pdf/PDFICCStream.java b/src/java/org/apache/fop/pdf/PDFICCStream.java
index 039a82fff..80263b552 100644
--- a/src/java/org/apache/fop/pdf/PDFICCStream.java
+++ b/src/java/org/apache/fop/pdf/PDFICCStream.java
@@ -51,6 +51,8 @@
 package org.apache.fop.pdf;
 
 import java.awt.color.ICC_Profile;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * Special PDFStream for ICC profiles (color profiles).
@@ -64,10 +66,10 @@ public class PDFICCStream extends PDFStream {
     private PDFColorSpace pdfColorSpace;
 
     /**
-     * @see org.apache.fop.pdf.PDFObject#PDFObject(int)
+     * @see org.apache.fop.pdf.PDFObject#PDFObject()
      */
-    public PDFICCStream(int num) {
-        super(num);
+    public PDFICCStream() {
+        super();
         cp = null;
     }
 
@@ -87,29 +89,37 @@ public class PDFICCStream extends PDFStream {
      * @see org.apache.fop.pdf.PDFObject#output(OutputStream)
      */
     protected int output(java.io.OutputStream stream)
-        throws java.io.IOException {
-
-        setData(cp.getData());
-
-        int length = 0;
-        String filterEntry = applyFilters();
-        StringBuffer pb = new StringBuffer();
-        pb.append(this.number).append(" ").append(this.generation).append(" obj\n<< ");
-        pb.append("/N ").append(cp.getNumComponents()).append(" ");
+                throws java.io.IOException {
+        int length = super.output(stream);
+        this.cp = null; //Free ICC stream when it's not used anymore
+        return length;
+    }
+    
+    /**
+     * @see org.apache.fop.pdf.PDFStream#outputRawStreamData(OutputStream)
+     */
+    protected void outputRawStreamData(OutputStream out) throws IOException {
+        cp.write(out);
+    }
+    
+    /**
+     * @see org.apache.fop.pdf.AbstractPDFStream#buildStreamDict(String)
+     */
+    protected String buildStreamDict(String lengthEntry) {
+        final String filterEntry = getFilterList().buildFilterDictEntries();
+        final StringBuffer sb = new StringBuffer(128);
+        sb.append(getObjectID());
+        sb.append("<< ");
+        sb.append("/N " + cp.getNumComponents());
 
         if (pdfColorSpace != null) {
-            pb.append("/Alternate /").append(pdfColorSpace.getColorSpacePDFString()).append(" ");
+            sb.append("\n/Alternate /" + pdfColorSpace.getColorSpacePDFString() + " ");
         }
 
-        pb.append("/Length ").append((data.getSize() + 1)).append(" ").append(filterEntry);
-        pb.append(" >>\n");
-        byte[] p = pb.toString().getBytes();
-        stream.write(p);
-        length += p.length;
-        length += outputStreamData(stream);
-        p = "endobj\n".getBytes();
-        stream.write(p);
-        length += p.length;
-        return length;
+        sb.append("\n/Length " + lengthEntry);
+        sb.append("\n" + filterEntry);
+        sb.append("\n>>\n");
+        return sb.toString();
     }
+
 }
diff --git a/src/java/org/apache/fop/pdf/PDFXObject.java b/src/java/org/apache/fop/pdf/PDFXObject.java
index 94dabac25..91778109a 100644
--- a/src/java/org/apache/fop/pdf/PDFXObject.java
+++ b/src/java/org/apache/fop/pdf/PDFXObject.java
@@ -67,7 +67,8 @@ import java.io.OutputStream;
  * This is used as a reference for inserting the same image in the
  * document in another place.
  */
-public class PDFXObject extends PDFObject {
+public class PDFXObject extends AbstractPDFStream {
+    
     private PDFImage pdfimage;
     private int xnum;
 
@@ -75,12 +76,11 @@ public class PDFXObject extends PDFObject {
      * create an XObject with the given number and name and load the
      * image in the object
      *
-     * @param number the pdf object number
      * @param xnumber the pdf object X number
      * @param img the pdf image that contains the image data
      */
-    public PDFXObject(int number, int xnumber, PDFImage img) {
-        super(number);
+    public PDFXObject(int xnumber, PDFImage img) {
+        super();
         this.xnum = xnumber;
         pdfimage = img;
     }
@@ -103,73 +103,8 @@ public class PDFXObject extends PDFObject {
      * @return the length of the data written
      */
     protected int output(OutputStream stream) throws IOException {
-        int length = 0;
-        int i = 0;
-
-        if (pdfimage.isPS()) {
-            length = outputEPSImage(stream);
-        } else {
-
-            PDFStream imgStream = pdfimage.getDataStream();
-
-            String dictEntries = imgStream.applyFilters();
-
-            String p = this.number + " " + this.generation + " obj\n";
-            p = p + "<</Type /XObject\n";
-            p = p + "/Subtype /Image\n";
-            p = p + "/Name /Im" + xnum + "\n";
-            p = p + "/Length " + (imgStream.getDataLength() + 1) + "\n";
-            p = p + "/Width " + pdfimage.getWidth() + "\n";
-            p = p + "/Height " + pdfimage.getHeight() + "\n";
-            p = p + "/BitsPerComponent " + pdfimage.getBitsPerPixel()
-                  + "\n";
-
-            PDFICCStream pdfICCStream = pdfimage.getICCStream();
-            if (pdfICCStream != null) {
-                p = p + "/ColorSpace [/ICCBased "
-                    + pdfICCStream.referencePDF() + "]\n";
-            } else {
-                PDFColorSpace cs = pdfimage.getColorSpace();
-                p = p + "/ColorSpace /" + cs.getColorSpacePDFString()
-                      + "\n";
-            }
-
-            /* PhotoShop generates CMYK values that's inverse,
-               this will invert the values - too bad if it's not
-               a PhotoShop image...
-             */
-            if (pdfimage.getColorSpace().getColorSpace()
-                    == PDFColorSpace.DEVICE_CMYK) {
-                p = p + "/Decode [ 1.0 0.0 1.0 0.0 1.0 0.0 1.1 0.0 ]\n";
-            }
-
-            if (pdfimage.isTransparent()) {
-                PDFColor transp = pdfimage.getTransparentColor();
-                p = p + "/Mask [" + transp.red255() + " "
-                    + transp.red255() + " " + transp.green255()
-                    + " " + transp.green255() + " "
-                    + transp.blue255() + " " + transp.blue255() + "]\n";
-            }
-            String ref = pdfimage.getSoftMask();
-            if (ref != null) {
-                p = p + "/SMask " + ref + "\n";
-            }
-
-            p = p + dictEntries;
-            p = p + ">>\n";
-
-            // push the pdf dictionary on the writer
-            byte[] pdfBytes = p.getBytes();
-            stream.write(pdfBytes);
-            length += pdfBytes.length;
-            // push all the image data on the writer
-            // and takes care of length for trailer
-            length += imgStream.outputStreamData(stream);
-
-            pdfBytes = ("endobj\n").getBytes();
-            stream.write(pdfBytes);
-            length += pdfBytes.length;
-        }
+        int length = super.output(stream);
+        
         // let it gc
         // this object is retained as a reference to inserting
         // the same image but the image data is no longer needed
@@ -177,37 +112,118 @@ public class PDFXObject extends PDFObject {
         return length;
     }
 
-    byte[] toPDF() {
-        return null;
+    /**
+     * @see org.apache.fop.pdf.AbstractPDFStream#buildStreamDict(String)
+     */
+    protected String buildStreamDict(String lengthEntry) {
+        String dictEntries = getFilterList().buildFilterDictEntries();
+        if (pdfimage.isPS()) {
+            return buildDictionaryFromPS(lengthEntry, dictEntries);
+        } else {
+            return buildDictionaryFromImage(lengthEntry, dictEntries);
+        }
+    }
+    
+    private String buildDictionaryFromPS(String lengthEntry, 
+                                         String dictEntries) {
+        StringBuffer sb = new StringBuffer(128);
+        sb.append(getObjectID());
+        sb.append("<</Type /XObject\n");
+        sb.append("/Subtype /PS\n");
+        sb.append("/Length " + lengthEntry);
+
+        sb.append(dictEntries);
+        sb.append("\n>>\n");
+        return sb.toString();
     }
 
-    private int outputEPSImage(OutputStream stream) throws IOException {
-        int length = 0;
-        int i = 0;
-
-        PDFStream imgStream = pdfimage.getDataStream();
-        String dictEntries = imgStream.applyFilters();
+    private String buildDictionaryFromImage(String lengthEntry,
+                                            String dictEntries) {
+        StringBuffer sb = new StringBuffer(128);
+        sb.append(getObjectID());
+        sb.append("<</Type /XObject\n");
+        sb.append("/Subtype /Image\n");
+        sb.append("/Name /Im" + xnum + "\n");
+        sb.append("/Length " + lengthEntry + "\n");
+        sb.append("/Width " + pdfimage.getWidth() + "\n");
+        sb.append("/Height " + pdfimage.getHeight() + "\n");
+        sb.append("/BitsPerComponent " + pdfimage.getBitsPerPixel() + "\n");
+
+        PDFICCStream pdfICCStream = pdfimage.getICCStream();
+        if (pdfICCStream != null) {
+            sb.append("/ColorSpace [/ICCBased "
+                + pdfICCStream.referencePDF() + "]\n");
+        } else {
+            PDFColorSpace cs = pdfimage.getColorSpace();
+            sb.append("/ColorSpace /" + cs.getColorSpacePDFString()
+                  + "\n");
+        }
 
-        String p = this.number + " " + this.generation + " obj\n";
-        p = p + "<</Type /XObject\n";
-        p = p + "/Subtype /PS\n";
-        p = p + "/Length " + (imgStream.getDataLength() + 1);
+        /* PhotoShop generates CMYK values that's inverse,
+           this will invert the values - too bad if it's not
+           a PhotoShop image...
+         */
+        if (pdfimage.getColorSpace().getColorSpace()
+                == PDFColorSpace.DEVICE_CMYK) {
+            sb.append("/Decode [ 1.0 0.0 1.0 0.0 1.0 0.0 1.1 0.0 ]\n");
+        }
 
-        p = p + dictEntries;
-        p = p + ">>\n";
+        if (pdfimage.isTransparent()) {
+            PDFColor transp = pdfimage.getTransparentColor();
+            sb.append("/Mask [" 
+                + transp.red255() + " "
+                + transp.red255() + " " 
+                + transp.green255() + " " 
+                + transp.green255() + " "
+                + transp.blue255() + " " 
+                + transp.blue255() + "]\n");
+        }
+        String ref = pdfimage.getSoftMask();
+        if (ref != null) {
+            sb.append("/SMask " + ref + "\n");
+        }
 
-        // push the pdf dictionary on the writer
-        byte[] pdfBytes = p.getBytes();
-        stream.write(pdfBytes);
-        length += pdfBytes.length;
-        // push all the image data on  the writer and takes care of length for trailer
-        length += imgStream.outputStreamData(stream);
+        sb.append(dictEntries);
+        sb.append("\n>>\n");
+        return sb.toString();
+    }
+    
+    /**
+     * @see org.apache.fop.pdf.PDFStream#outputRawStreamData(OutputStream)
+     */
+    protected void outputRawStreamData(OutputStream out) throws IOException {
+        pdfimage.outputContents(out);
+    }
 
-        pdfBytes = ("endobj\n").getBytes();
-        stream.write(pdfBytes);
-        length += pdfBytes.length;
+    /**
+     * @see org.apache.fop.pdf.AbstractPDFStream#getSizeHint()
+     */
+    protected int getSizeHint() throws IOException {
+        return 0;
+    }
 
-        return length;
+    /**
+     * @see org.apache.fop.pdf.AbstractPDFStream#prepareImplicitFilters()
+     */
+    protected void prepareImplicitFilters() {
+        if (pdfimage.isDCT()) {
+            getFilterList().ensureDCTFilterInPlace();
+        }
+    }
+    
+    /**
+     * This sets up the default filters for XObjects. It uses the PDFImage
+     * instance to determine what default filters to apply.
+     * @see org.apache.fop.pdf.AbstractPDFStream#setupFilterList()
+     */
+    protected void setupFilterList() {
+        if (!getFilterList().isInitialized()) {
+            getFilterList().addDefaultFilters(
+                getDocumentSafely().getFilterMap(), 
+                pdfimage.getFilterHint());
+        }
+        super.setupFilterList();
     }
+    
 
 }