jeremias 2003/03/27 23:29:26
Modified: src/java/org/apache/fop/pdf PDFFilterList.java
DCTFilter.java
Added: src/java/org/apache/fop/pdf NullFilter.java
Log:
Default without any configuration is now (again?) Flate filter.
I've added a NullFilter so you can explicitly disable all active filters. Specify
"null" as filter in the Avalon Configuration.
DCTFilter now descends from NullFilter because it is ATM only a passive filter.
Revision Changes Path
1.2 +3 -1 xml-fop/src/java/org/apache/fop/pdf/PDFFilterList.java
Index: PDFFilterList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFFilterList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PDFFilterList.java 27 Mar 2003 10:23:37 -0000 1.1
+++ PDFFilterList.java 28 Mar 2003 07:29:26 -0000 1.2
@@ -132,6 +132,8 @@
}
if (filterType.equals("flate")) {
addFilter(new FlateFilter());
+ } else if (filterType.equals("null")) {
+ addFilter(new NullFilter());
} else if (filterType.equals("ascii-85")) {
if (this.ignoreASCIIFilters) {
return; //ignore ASCII filter
@@ -179,7 +181,7 @@
}
if (filterset == null || filterset.size() == 0) {
// built-in default to flate
- //addFilter(new FlateFilter());
+ addFilter(new FlateFilter());
} else {
for (int i = 0; i < filterset.size(); i++) {
String v = (String)filterset.get(i);
1.3 +1 -29 xml-fop/src/java/org/apache/fop/pdf/DCTFilter.java
Index: DCTFilter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/DCTFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DCTFilter.java 27 Mar 2003 10:18:05 -0000 1.2
+++ DCTFilter.java 28 Mar 2003 07:29:26 -0000 1.3
@@ -50,12 +50,6 @@
*/
package org.apache.fop.pdf;
-import org.apache.fop.util.StreamUtilities;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
/**
* DCT Filter class. Right now it is just used as a dummy filter flag so
* we can write JPG images to the PDF. The encode method just returns the
@@ -64,7 +58,7 @@
*
* @author Eric Dalquist
*/
-public class DCTFilter extends PDFFilter {
+public class DCTFilter extends NullFilter {
/**
* Get filter name.
@@ -80,28 +74,6 @@
*/
public String getDecodeParms() {
return null;
- }
-
- /**
- * Encode a stream with this filter.
- * Currently no encoding is performed, it is assumed that the data
- * is already encoded.
- * @param in the input data stream
- * @param out the output stream
- * @param length the length of the data
- * @throws IOException if there is an io error
- */
- public void encode(InputStream in, OutputStream out, int length) throws
IOException {
- StreamUtilities.streamCopy(in, out, length);
- 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
}
}
1.1 xml-fop/src/java/org/apache/fop/pdf/NullFilter.java
Index: NullFilter.java
===================================================================
/*
* $Id$
* ============================================================================
* The Apache Software License, Version 1.1
* ============================================================================
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear.
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior
* written permission. For written permission, please contact
* [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache", nor may
* "Apache" appear in their name, without prior written permission of the
* Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
* DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================
*
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by
* James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop.pdf;
import org.apache.fop.util.StreamUtilities;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
/**
* Null Filter class. The content is just passed through. The class is used to
* override the default Flate filter for debugging purposes.
*/
public class NullFilter extends PDFFilter {
/**
* @see org.apache.fop.pdf.PDFFilter#getName()
*/
public String getName() {
return "";
}
/**
* @see org.apache.fop.pdf.PDFFilter#getDecodeParms()
*/
public String getDecodeParms() {
return null;
}
/**
* @see org.apache.fop.pdf.PDFFilter#encode(InputStream, OutputStream, int)
*/
public void encode(InputStream in, OutputStream out, int length) throws
IOException {
StreamUtilities.streamCopy(in, out, length);
out.close();
}
/**
* @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
*/
public OutputStream applyFilter(OutputStream out) throws IOException {
return out;
//No active filtering, NullFilter does nothing
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
