Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-05 12:35:29 -04:00
Code Issues Projects Releases Wiki Activity

TIFF Fax option byte aligned now constructor parameter. Made all option fields final.

Browse Source
This commit is contained in:
Harald Kuhr 2018-01-17 13:58:55 +01:00
parent 6936e7cbb2
commit b3b06dff4a
2 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
View File

@ -50,13 +50,19 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
private final int columns; private final int columns;
private final byte[] decodedRow; private final byte[] decodedRow;
private int decodedLength; private final boolean optionG32D;
private int decodedPos; // Leading zeros for aligning EOL
private final boolean optionG3Fill;
private final boolean optionUncompressed;
private final boolean optionByteAligned;
// Need to take fill order into account (?) (use flip table?) // Need to take fill order into account (?) (use flip table?)
private final int fillOrder; private final int fillOrder;
private final int type; private final int type;
private int decodedLength;
private int decodedPos;
private int[] changesReferenceRow; private int[] changesReferenceRow;
private int[] changesCurrentRow; private int[] changesCurrentRow;
private int changesReferenceRowCount; private int changesReferenceRowCount;
@ -64,22 +70,24 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
private int lastChangingElement = 0; private int lastChangingElement = 0;
private boolean optionG32D = false; /**
* Creates a CCITTFaxDecoderStream.
@SuppressWarnings("unused") // Leading zeros for aligning EOL * This is used for CCITT streams from PDF files, which use EncodedByteAlign.
private boolean optionG3Fill = false; *
* @param stream the compressed CCITT stream.
private boolean optionUncompressed = false; * @param columns the number of columns in the stream.
* @param type the type of stream, must be one of {@code COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE},
private boolean optionByteAligned = false; * {@code COMPRESSION_CCITT_T4} or {@code COMPRESSION_CCITT_T6}.
* @param fillOrder fillOrder, must be {@code FILL_LEFT_TO_RIGHT} or
* {@code FILL_RIGHT_TO_LEFT}.
* @param options CCITT T.4 or T.6 options.
* @param byteAligned enable byte alignment used in PDF files (EncodedByteAlign).
*/
public CCITTFaxDecoderStream(final InputStream stream, final int columns, final int type, final int fillOrder, public CCITTFaxDecoderStream(final InputStream stream, final int columns, final int type, final int fillOrder,
final long options) { final long options, final boolean byteAligned) {
super(Validate.notNull(stream, "stream")); super(Validate.notNull(stream, "stream"));
this.columns = Validate.isTrue(columns > 0, columns, "width must be greater than 0"); this.columns = Validate.isTrue(columns > 0, columns, "width must be greater than 0");
// We know this is only used for b/w (1 bit)
this.decodedRow = new byte[(columns + 7) / 8];
this.type = Validate.isTrue( this.type = Validate.isTrue(
type == TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE || type == TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE ||
type == TIFFExtension.COMPRESSION_CCITT_T4 || type == TIFFExtension.COMPRESSION_CCITT_T6, type == TIFFExtension.COMPRESSION_CCITT_T4 || type == TIFFExtension.COMPRESSION_CCITT_T6,
@ -90,21 +98,33 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
fillOrder, "Expected fill order 1 or 2: %s" fillOrder, "Expected fill order 1 or 2: %s"
); );
this.changesReferenceRow = new int[columns + 2]; // We know this is only used for b/w (1 bit)
this.changesCurrentRow = new int[columns + 2]; decodedRow = new byte[(columns + 7) / 8];
changesReferenceRow = new int[columns + 2];
changesCurrentRow = new int[columns + 2];
switch (type) { switch (type) {
case TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE: case TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE:
optionByteAligned = true; optionByteAligned = true;
optionG32D = false;
optionG3Fill = false;
optionUncompressed = false;
break; break;
case TIFFExtension.COMPRESSION_CCITT_T4: case TIFFExtension.COMPRESSION_CCITT_T4:
optionByteAligned = byteAligned;
optionG32D = (options & TIFFExtension.GROUP3OPT_2DENCODING) != 0; optionG32D = (options & TIFFExtension.GROUP3OPT_2DENCODING) != 0;
optionG3Fill = (options & TIFFExtension.GROUP3OPT_FILLBITS) != 0; optionG3Fill = (options & TIFFExtension.GROUP3OPT_FILLBITS) != 0;
optionUncompressed = (options & TIFFExtension.GROUP3OPT_UNCOMPRESSED) != 0; optionUncompressed = (options & TIFFExtension.GROUP3OPT_UNCOMPRESSED) != 0;
break; break;
case TIFFExtension.COMPRESSION_CCITT_T6: case TIFFExtension.COMPRESSION_CCITT_T6:
optionByteAligned = byteAligned;
optionG32D = false;
optionG3Fill = false;
optionUncompressed = (options & TIFFExtension.GROUP4OPT_UNCOMPRESSED) != 0; optionUncompressed = (options & TIFFExtension.GROUP4OPT_UNCOMPRESSED) != 0;
break; break;
default:
// Guarded above
throw new AssertionError();
} }
Validate.isTrue(!optionUncompressed, optionUncompressed, Validate.isTrue(!optionUncompressed, optionUncompressed,
@ -112,12 +132,19 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
} }
/** /**
* This is used for CCITT streams from PDF files, which use EncodedByteAlign * Creates a CCITTFaxDecoderStream.
* *
* @param enable enable byte alignment * @param stream the compressed CCITT stream.
* @param columns the number of columns in the stream.
* @param type the type of stream, must be one of {@code COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE},
* {@code COMPRESSION_CCITT_T4} or {@code COMPRESSION_CCITT_T6}.
* @param fillOrder fillOrder, must be {@code FILL_LEFT_TO_RIGHT} or
* {@code FILL_RIGHT_TO_LEFT}.
* @param options CCITT T.4 or T.6 options.
*/ */
public void setOptionByteAligned(boolean enable) { public CCITTFaxDecoderStream(final InputStream stream, final int columns, final int type, final int fillOrder,
optionByteAligned = enable; final long options) {
this(stream, columns, type, fillOrder, options, false);
} }
private void fetch() throws IOException { private void fetch() throws IOException {
@ -133,8 +160,8 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
throw e; throw e;
} }
// ..otherwise, just client code trying to read past the end of // ..otherwise, just let client code try to read past the
// stream // end of stream
decodedLength = -1; decodedLength = -1;
} }

3
imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStreamTest.java
View File

@ -272,8 +272,7 @@ public class CCITTFaxDecoderStreamTest {
@Test @Test
public void testDecodeType4ByteAligned() throws IOException { public void testDecodeType4ByteAligned() throws IOException {
CCITTFaxDecoderStream stream = new CCITTFaxDecoderStream(new ByteArrayInputStream(DATA_G4_ALIGNED), 6, CCITTFaxDecoderStream stream = new CCITTFaxDecoderStream(new ByteArrayInputStream(DATA_G4_ALIGNED), 6,
TIFFExtension.COMPRESSION_CCITT_T6, 1, 0L); TIFFExtension.COMPRESSION_CCITT_T6, 1, 0L, true);
stream.setOptionByteAligned(true);
byte[] imageData = ((DataBufferByte) image.getData().getDataBuffer()).getData(); byte[] imageData = ((DataBufferByte) image.getData().getDataBuffer()).getData();
byte[] bytes = new byte[imageData.length]; byte[] bytes = new byte[imageData.length];