Filters can indicate whether they are ASCII filters (which can be disabled if the...

Filters have a new method for returning a FilteredOutputStream for the new on-the-fly stream output.

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

diff --git a/src/java/org/apache/fop/pdf/ASCII85Filter.java b/src/java/org/apache/fop/pdf/ASCII85Filter.java
index fdec499bcf793ae67ca6be91f0747b0732b59a82..dcdcd5c55d4d14bc677ca844ff0a3e3785cbc902 100644 (file)
--- a/src/java/org/apache/fop/pdf/ASCII85Filter.java
+++ b/src/java/org/apache/fop/pdf/ASCII85Filter.java
@@ -54,6 +54,8 @@ import java.io.OutputStream;
 import java.io.InputStream;
 import java.io.IOException;
 
+import org.apache.fop.render.ps.ASCII85OutputStream;
+
 /**
  * PDF Filter for ASCII85.
  * This applies a filter to a pdf stream that converts
@@ -78,6 +80,13 @@ public class ASCII85Filter extends PDFFilter {
         return "/ASCII85Decode";
     }
 
+    /**
+     * @see org.apache.fop.pdf.PDFFilter#isASCIIFilter()
+     */
+    public boolean isASCIIFilter() {
+        return true;
+    }
+    
     /**
      * Get the decode parameters.
      *
@@ -239,4 +248,11 @@ public class ASCII85Filter extends PDFFilter {
         }
     }
 
+    /**
+     * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+     */
+    public OutputStream applyFilter(OutputStream out) throws IOException {
+        return new ASCII85OutputStream(out);
+    }
+
 }

diff --git a/src/java/org/apache/fop/pdf/ASCIIHexFilter.java b/src/java/org/apache/fop/pdf/ASCIIHexFilter.java
index 52756d706552b524d8d23c63b5b543748682a919..0e082cbe1a16e4be5afc5ba418c033cd0e49efe3 100644 (file)
--- a/src/java/org/apache/fop/pdf/ASCIIHexFilter.java
+++ b/src/java/org/apache/fop/pdf/ASCIIHexFilter.java
@@ -56,6 +56,8 @@ import java.io.Writer;
 import java.io.OutputStreamWriter;
 import java.io.IOException;
 
+import org.apache.fop.render.ps.ASCIIHexOutputStream;
+
 /**
  * ASCII Hex filter for PDF streams.
  * This filter converts a pdf stream to ASCII hex data.
@@ -72,6 +74,13 @@ public class ASCIIHexFilter extends PDFFilter {
         return "/ASCIIHexDecode";
     }
 
+    /**
+     * @see org.apache.fop.pdf.PDFFilter#isASCIIFilter()
+     */
+    public boolean isASCIIFilter() {
+        return true;
+    }
+    
     /**
      * Get the decode params.
      *
@@ -103,4 +112,11 @@ public class ASCIIHexFilter extends PDFFilter {
         writer.close();
     }
 
+    /**
+     * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+     */
+    public OutputStream applyFilter(OutputStream out) throws IOException {
+        return new ASCIIHexOutputStream(out);
+    }
+
 }

diff --git a/src/java/org/apache/fop/pdf/DCTFilter.java b/src/java/org/apache/fop/pdf/DCTFilter.java
index 04af62b75e2ae5c911a029f12606234ae936d2bc..6a83c998ed4e3f37402546fc24f28864587e1443 100644 (file)
--- a/src/java/org/apache/fop/pdf/DCTFilter.java
+++ b/src/java/org/apache/fop/pdf/DCTFilter.java
@@ -96,5 +96,13 @@ public class DCTFilter extends PDFFilter {
         out.close();
     }
 
+    /**
+     * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+     */
+    public OutputStream applyFilter(OutputStream out) throws IOException {
+        return out;
+        //No active filtering, OutputStream is already expected to be DCT encoded
+    }
+
 }
 

diff --git a/src/java/org/apache/fop/pdf/FlateFilter.java b/src/java/org/apache/fop/pdf/FlateFilter.java
index f830fdd0972986e6e258ca81203a4dcda6efbe6e..276e3fc40e1a58b61b723a946256c3ebec12c7c6 100644 (file)
--- a/src/java/org/apache/fop/pdf/FlateFilter.java
+++ b/src/java/org/apache/fop/pdf/FlateFilter.java
@@ -50,6 +50,7 @@
  */ 
 package org.apache.fop.pdf;
 
+import org.apache.fop.render.ps.FlateEncodeOutputStream;
 import org.apache.fop.util.StreamUtilities;
 
 import java.io.OutputStream;
@@ -58,7 +59,9 @@ import java.io.IOException;
 import java.util.zip.DeflaterOutputStream;
 
 /**
- * A filter to deflate a stream. Note that the attributes for
+ * A filter to deflate a stream.
+ * <p>
+ * <b>Note</b> that the attributes for
  * prediction, colors, bitsPerComponent, and columns are not supported
  * when this filter is used to handle the data compression. They are
  * only valid for externally encoded data such as that from a graphics
@@ -268,4 +271,11 @@ public class FlateFilter extends PDFFilter {
     }
 
 
+    /**
+     * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+     */
+    public OutputStream applyFilter(OutputStream out) throws IOException {
+        return new FlateEncodeOutputStream(out);
+    }
+
 }

diff --git a/src/java/org/apache/fop/pdf/PDFFilter.java b/src/java/org/apache/fop/pdf/PDFFilter.java
index 9dba287bb889bf5cb0528f508616b858f0531f16..e8a18b3ffbd0f2488cfffec2e6410c856cf3c7fd 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFFilter.java
+++ b/src/java/org/apache/fop/pdf/PDFFilter.java
@@ -110,6 +110,15 @@ public abstract class PDFFilter {
      */
     public abstract String getName();
 
+    /**
+     * Returns true if the filter is an ASCII filter that isn't necessary
+     * when encryption is active.
+     * @return boolean True if this filter is an ASCII filter
+     */
+    public boolean isASCIIFilter() {
+        return false;
+    }
+
     /**
      * return a parameter dictionary for this filter, or null
      *
@@ -127,4 +136,12 @@ public abstract class PDFFilter {
      */
     public abstract void encode(InputStream in, OutputStream out, int length) throws IOException;
 
+    /**
+     * Applies a filter to an OutputStream.
+     * @param out contents to be filtered
+     * @return OutputStream filtered contents
+     * @throws IOException In case of an I/O problem
+     */
+    public abstract OutputStream applyFilter(OutputStream out) throws IOException;
+
 }