mirrors
/
fop
Mirror von https://github.com/apache/fop.git
Beobachten 1
Favorisieren 0
Fork 0
Code Issues 0 Releases 48 Wiki Aktivität
Quellcode durchsuchen

Remove obsolete code 


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196602 13f79535-47bb-0310-9956-ffa450edef68
pull/30/head
Jeremias Maerki vor 21 Jahren
Ursprung
06acca836f
Commit
a457207f8c
5 geänderte Dateien mit 4 neuen und 243 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 1
    162
      src/java/org/apache/fop/pdf/ASCII85Filter.java
  2. 2
    28
      src/java/org/apache/fop/pdf/ASCIIHexFilter.java
  3. 1
    31
      src/java/org/apache/fop/pdf/FlateFilter.java
  4. 0
    11
      src/java/org/apache/fop/pdf/NullFilter.java
  5. 0
    11
      src/java/org/apache/fop/pdf/PDFFilter.java

+ 1
- 162
src/java/org/apache/fop/pdf/ASCII85Filter.java Datei anzeigen

@@ -51,10 +51,9 @@
package org.apache.fop.pdf;

import java.io.OutputStream;
import java.io.InputStream;
import java.io.IOException;

import org.apache.fop.render.ps.ASCII85OutputStream;
import org.apache.fop.util.ASCII85OutputStream;

/**
* PDF Filter for ASCII85.
@@ -62,14 +61,6 @@ import org.apache.fop.render.ps.ASCII85OutputStream;
* the data to ASCII.
*/
public class ASCII85Filter extends PDFFilter {
private static final char ASCII85_ZERO = 'z';
private static final char ASCII85_START = '!';
private static final String ASCII85_EOD = "~>";

private static final long BASE85_4 = 85;
//private static final long base85_3 = base85_4 * base85_4;
//private static final long base85_2 = base85_3 * base85_4;
//private static final long base85_1 = base85_2 * base85_4;

/**
* Get the PDF name of this filter.
@@ -96,158 +87,6 @@ public class ASCII85Filter extends PDFFilter {
return null;
}

/**
* Encode a pdf stream using this filter.
*
* @param in the input stream to read the data from
* @param out the output stream to write the data
* @param length the length of the data to filter
* @throws IOException if there is an error reading or writing to the streams
*/
public void encode(InputStream in, OutputStream out, int length) throws IOException {

int i;
int total = 0;
int diff = 0;

// first encode the majority of the data
// each 4 byte group becomes a 5 byte group
for (i = 0; i + 3 < length; i += 4) {

long val = ((in.read() << 24)
& 0xff000000L) // note: must have the L at the
+ ((in.read() << 16) & 0xff0000L) // end, otherwise you get into
+ ((in.read() << 8) & 0xff00L) // weird signed value problems
+ (in.read() & 0xffL); // cause we're using a full 32 bits
byte[] conv = convertWord(val);

out.write(conv, 0, conv.length);

}

// now take care of the trailing few bytes.
// with n leftover bytes, we append 0 bytes to make a full group of 4
// then convert like normal (except not applying the special zero rule)
// and write out the first n+1 bytes from the result
if (i < length) {
int n = length - i;
byte[] lastdata = new byte[4];
for (int j = 0; j < 4; j++) {
if (j < n) {
lastdata[j] = (byte)in.read();
} else {
lastdata[j] = 0;
}
}

long val = ((lastdata[0] << 24) & 0xff000000L)
+ ((lastdata[1] << 16) & 0xff0000L)
+ ((lastdata[2] << 8) & 0xff00L)
+ (lastdata[3] & 0xffL);
byte[] conv = convertWord(val);

// special rule for handling zeros at the end
if (val == 0) {
conv = new byte[5];
for (int j = 0; j < 5; j++) {
conv[j] = (byte)'!';
}
}
// assert n+1 <= 5
out.write(conv, 0, n + 1);
// System.out.println("ASCII85 end of data was "+n+" bytes long");

}
// finally write the two character end of data marker
out.write(ASCII85_EOD.getBytes(), 0,
ASCII85_EOD.getBytes().length);


// assert that we have the correct outgoing length
/*
* int in = (data.length % 4);
* int out = (result.length-ASCII85_EOD.getBytes().length) % 5;
* if ((in+1 != out) && !(in == 0 && out == 0)) {
* System.out.println("ASCII85 assertion failed:");
* System.out.println("inlength = "+data.length+" inlength % 4 = "
* + (data.length % 4)+" outlength = "
* + (result.length-ASCII85_EOD.getBytes().length)
* + " outlength % 5 = "
* + ((result.length-ASCII85_EOD.getBytes().length) % 5));
* }
*/

out.close();
}

/**
* This converts a 32 bit value (4 bytes) into 5 bytes using base 85.
* each byte in the result starts with zero at the '!' character so
* the resulting base85 number fits into printable ascii chars
*
* @param word the 32 bit unsigned (hence the long datatype) word
* @return 5 bytes (or a single byte of the 'z' character for word
* values of 0)
*/
private byte[] convertWord(long word) {
word = word & 0xffffffff;
if (word < 0) {
word = -word;
}

if (word == 0) {
byte[] result = {
(byte)ASCII85_ZERO
};
return result;
} else {
/*
byte c1 = (byte)((word / base85_1) & 0xFF);
byte c2 = (byte)(((word - (c1 * base85_1)) / base85_2) & 0xFF);
byte c3 =
(byte)(((word - (c1 * base85_1) - (c2 * base85_2)) / base85_3)
& 0xFF);
byte c4 = (byte)(((word - (c1 * base85_1)
- (c2 * base85_2) - (c3 * base85_3)) / base85_4)
& 0xFF);
byte c5 = (byte)(((word - (c1 * base85_1)
- (c2 * base85_2) - (c3 * base85_3) - (c4 * base85_4)))
& 0xFF);

byte[] ret = {
(byte)(c1 + ASCII85_START), (byte)(c2 + ASCII85_START),
(byte)(c3 + ASCII85_START), (byte)(c4 + ASCII85_START),
(byte)(c5 + ASCII85_START)
};
*/

byte c5 = (byte)((word % BASE85_4) + ASCII85_START);
word = word / BASE85_4;
byte c4 = (byte)((word % BASE85_4) + ASCII85_START);
word = word / BASE85_4;
byte c3 = (byte)((word % BASE85_4) + ASCII85_START);
word = word / BASE85_4;
byte c2 = (byte)((word % BASE85_4) + ASCII85_START);
word = word / BASE85_4;
byte c1 = (byte)((word % BASE85_4) + ASCII85_START);

byte[] ret = {
c1 , c2, c3, c4, c5
};

for (int i = 0; i < ret.length; i++) {
if (ret[i] < 33 || ret[i] > 117) {
System.out.println("illegal char value "
+ new Integer(ret[i]));
}
}

return ret;


}
}

/**
* @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
*/

+ 2
- 28
src/java/org/apache/fop/pdf/ASCIIHexFilter.java Datei anzeigen

@@ -51,20 +51,16 @@
package org.apache.fop.pdf;

import java.io.OutputStream;
import java.io.InputStream;
import java.io.Writer;
import java.io.OutputStreamWriter;
import java.io.IOException;

import org.apache.fop.render.ps.ASCIIHexOutputStream;
import org.apache.fop.util.ASCIIHexOutputStream;

/**
* ASCII Hex filter for PDF streams.
* This filter converts a pdf stream to ASCII hex data.
*/
public class ASCIIHexFilter extends PDFFilter {
private static final String ASCIIHEX_EOD = ">";

/**
* Get the name of this filter.
*
@@ -90,28 +86,6 @@ public class ASCIIHexFilter extends PDFFilter {
return null;
}

/**
* Encode the pdf stream using this filter.
*
* @param in the input stream to read the data from
* @param out the output stream to write data to
* @param length the length of data to read from the stream
* @throws IOException if an error occurs reading or writing to
* the streams
*/
public void encode(InputStream in, OutputStream out, int length) throws IOException {
Writer writer = new OutputStreamWriter(out);
for (int i = 0; i < length; i++) {
int val = (int)(in.read() & 0xFF);
if (val < 16) {
writer.write("0");
}
writer.write(Integer.toHexString(val));
}
writer.write(ASCIIHEX_EOD);
writer.close();
}

/**
* @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
*/

+ 1
- 31
src/java/org/apache/fop/pdf/FlateFilter.java Datei anzeigen

@@ -50,13 +50,10 @@
*/
package org.apache.fop.pdf;

import org.apache.fop.render.ps.FlateEncodeOutputStream;
import org.apache.fop.util.StreamUtilities;
import org.apache.fop.util.FlateEncodeOutputStream;

import java.io.OutputStream;
import java.io.InputStream;
import java.io.IOException;
import java.util.zip.DeflaterOutputStream;

/**
* A filter to deflate a stream.
@@ -148,33 +145,6 @@ public class FlateFilter extends PDFFilter {
return null;
}


/**
* Encode the given data and return it. Note: a side effect of
* this method is that it resets the prediction to the default
* because these attributes are not supported. So the DecodeParms
* should be retrieved after calling this method.
*
* @param in the input stream to read the data from
* @param out the output stream to write the data to
* @param length the length of data to read
* @throws IOException if there is an error reading or writing to the streams
*/
public void encode(InputStream in, OutputStream out, int length) throws IOException {
predictor = PREDICTION_NONE;
try {
DeflaterOutputStream compressedStream =
new DeflaterOutputStream(out);
StreamUtilities.streamCopy(in, compressedStream, length);
compressedStream.flush();
compressedStream.close();
} catch (IOException e) {
//log.error("Fatal error: "
// + e.getMessage(), e);
}

}

/**
* Set the predictor for this filter.
*

+ 0
- 11
src/java/org/apache/fop/pdf/NullFilter.java Datei anzeigen

@@ -50,10 +50,7 @@
*/
package org.apache.fop.pdf;

import org.apache.fop.util.StreamUtilities;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;

/**
@@ -76,14 +73,6 @@ public class NullFilter extends PDFFilter {
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)
*/

+ 0
- 11
src/java/org/apache/fop/pdf/PDFFilter.java Datei anzeigen

@@ -50,7 +50,6 @@
*/
package org.apache.fop.pdf;

import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;

@@ -126,16 +125,6 @@ public abstract class PDFFilter {
*/
public abstract String getDecodeParms();

/**
* encode the given data with the filter
*
* @param in the input data stream to encode
* @param out the output stream to write the result
* @param length the length of data to read from the input stream
* @throws IOException if there is an error reading or writing the data
*/
public abstract void encode(InputStream in, OutputStream out, int length) throws IOException;

/**
* Applies a filter to an OutputStream.
* @param out contents to be filtered

Verfassen Vorschau
Laden…
Abbrechen
Speichern