diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
index a495c240..2b334c9d 100644
--- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
+++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
@@ -28,24 +28,23 @@
package com.twelvemonkeys.imageio.plugins.tiff;
+import com.twelvemonkeys.lang.Validate;
+
import java.io.EOFException;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
-import com.twelvemonkeys.imageio.metadata.exif.TIFF;
-import com.twelvemonkeys.lang.Validate;
-
/**
* CCITT Modified Huffman RLE, Group 3 (T4) and Group 4 (T6) fax compression.
- *
+ *
* @author Harald Kuhr
+ * @author Oliver Schmidtmer
* @author last modified by $Author: haraldk$
* @version $Id: CCITTFaxDecoderStream.java,v 1.0 23.05.12 15:55 haraldk Exp$
*/
final class CCITTFaxDecoderStream extends FilterInputStream {
- // See TIFF 6.0 Specification, Section 10: "Modified Huffman Compression",
- // page 43.
+ // See TIFF 6.0 Specification, Section 10: "Modified Huffman Compression", page 43.
private final int columns;
private final byte[] decodedRow;
@@ -62,8 +61,6 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
private int changesReferenceRowCount;
private int changesCurrentRowCount;
- private static final int EOL_CODE = 0x01; // 12 bit
-
private boolean optionG32D = false;
@SuppressWarnings("unused") // Leading zeros for aligning EOL
@@ -72,29 +69,34 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
private boolean optionUncompressed = false;
public CCITTFaxDecoderStream(final InputStream stream, final int columns, final int type, final int fillOrder,
- final long options) {
+ final long options) {
super(Validate.notNull(stream, "stream"));
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 = type;
- this.fillOrder = fillOrder;// Validate.isTrue(fillOrder == 1, fillOrder,
- // "Only fill order 1 supported: %s"); //
- // TODO: Implement fillOrder == 2
+ this.type = Validate.isTrue(
+ type == TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE ||
+ type == TIFFExtension.COMPRESSION_CCITT_T4 || type == TIFFExtension.COMPRESSION_CCITT_T6,
+ type, "Only CCITT Modified Huffman RLE compression (2), CCITT T4 (3) or CCITT T6 (4) supported: %s"
+ );
+ this.fillOrder = Validate.isTrue(
+ fillOrder == TIFFBaseline.FILL_LEFT_TO_RIGHT || fillOrder == TIFFExtension.FILL_RIGHT_TO_LEFT,
+ fillOrder, "Expected fill order 1 or 2: %s"
+ );
this.changesReferenceRow = new int[columns];
this.changesCurrentRow = new int[columns];
switch (type) {
- case TIFFExtension.COMPRESSION_CCITT_T4:
- optionG32D = (options & TIFFExtension.GROUP3OPT_2DENCODING) != 0;
- optionG3Fill = (options & TIFFExtension.GROUP3OPT_FILLBITS) != 0;
- optionUncompressed = (options & TIFFExtension.GROUP3OPT_UNCOMPRESSED) != 0;
- break;
- case TIFFExtension.COMPRESSION_CCITT_T6:
- optionUncompressed = (options & TIFFExtension.GROUP4OPT_UNCOMPRESSED) != 0;
- break;
+ case TIFFExtension.COMPRESSION_CCITT_T4:
+ optionG32D = (options & TIFFExtension.GROUP3OPT_2DENCODING) != 0;
+ optionG3Fill = (options & TIFFExtension.GROUP3OPT_FILLBITS) != 0;
+ optionUncompressed = (options & TIFFExtension.GROUP3OPT_UNCOMPRESSED) != 0;
+ break;
+ case TIFFExtension.COMPRESSION_CCITT_T6:
+ optionUncompressed = (options & TIFFExtension.GROUP4OPT_UNCOMPRESSED) != 0;
+ break;
}
Validate.isTrue(!optionUncompressed, optionUncompressed,
@@ -107,7 +109,8 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
try {
decodeRow();
- } catch (EOFException e) {
+ }
+ catch (EOFException e) {
// TODO: Rewrite to avoid throw/catch for normal flow...
if (decodedLength != 0) {
throw e;
@@ -126,16 +129,20 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
int index = 0;
boolean white = true;
changesCurrentRowCount = 0;
+
do {
- int completeRun = 0;
+ int completeRun;
+
if (white) {
completeRun = decodeRun(whiteRunTree);
- } else {
+ }
+ else {
completeRun = decodeRun(blackRunTree);
}
index += completeRun;
changesCurrentRow[changesCurrentRowCount++] = index;
+
// Flip color for next run
white = !white;
} while (index < columns);
@@ -157,45 +164,53 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
boolean white = true;
int index = 0;
changesCurrentRowCount = 0;
+
mode: while (index < columns) {
// read mode
Node n = codeTree.root;
+
while (true) {
n = n.walk(readBit());
+
if (n == null) {
continue mode;
- } else if (n.isLeaf) {
-
+ }
+ else if (n.isLeaf) {
switch (n.value) {
- case VALUE_HMODE:
- int runLength = 0;
- runLength = decodeRun(white ? whiteRunTree : blackRunTree);
- index += runLength;
- changesCurrentRow[changesCurrentRowCount++] = index;
+ case VALUE_HMODE:
+ int runLength;
- runLength = decodeRun(white ? blackRunTree : whiteRunTree);
- index += runLength;
- changesCurrentRow[changesCurrentRowCount++] = index;
- break;
- case VALUE_PASSMODE:
- index = changesReferenceRow[getNextChangingElement(index, white) + 1];
- break;
- default:
- // Vertical mode (-3 to 3)
- index = changesReferenceRow[getNextChangingElement(index, white)] + n.value;
- changesCurrentRow[changesCurrentRowCount] = index;
- changesCurrentRowCount++;
- white = !white;
- break;
+ runLength = decodeRun(white ? whiteRunTree : blackRunTree);
+ index += runLength;
+ changesCurrentRow[changesCurrentRowCount++] = index;
+
+ runLength = decodeRun(white ? blackRunTree : whiteRunTree);
+ index += runLength;
+ changesCurrentRow[changesCurrentRowCount++] = index;
+ break;
+
+ case VALUE_PASSMODE:
+ index = changesReferenceRow[getNextChangingElement(index, white) + 1];
+ break;
+
+ default:
+ // Vertical mode (-3 to 3)
+ index = changesReferenceRow[getNextChangingElement(index, white)] + n.value;
+ changesCurrentRow[changesCurrentRowCount] = index;
+ changesCurrentRowCount++;
+ white = !white;
+ break;
}
+
continue mode;
}
}
}
}
- private int getNextChangingElement(int a0, boolean white) {
+ private int getNextChangingElement(final int a0, final boolean white) {
int start = white ? 0 : 1;
+
for (int i = start; i < changesReferenceRowCount; i += 2) {
if (a0 < changesReferenceRow[i]) {
return i;
@@ -214,20 +229,24 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
eof: while (true) {
// read till next EOL code
Node n = eolOnlyTree.root;
+
while (true) {
- Node tmp = n;
n = n.walk(readBit());
- if (n == null)
+
+ if (n == null) {
continue eof;
+ }
+
if (n.isLeaf) {
break eof;
}
}
}
- boolean k = optionG32D ? readBit() : true;
- if (k) {
+
+ if (!optionG32D || readBit()) {
decode1D();
- } else {
+ }
+ else {
decode2D();
}
}
@@ -238,23 +257,27 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
private void decodeRow() throws IOException {
switch (type) {
- case TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE:
- decodeRowType2();
- break;
- case TIFFExtension.COMPRESSION_CCITT_T4:
- decodeRowType4();
- break;
- case TIFFExtension.COMPRESSION_CCITT_T6:
- decodeRowType6();
- break;
+ case TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE:
+ decodeRowType2();
+ break;
+ case TIFFExtension.COMPRESSION_CCITT_T4:
+ decodeRowType4();
+ break;
+ case TIFFExtension.COMPRESSION_CCITT_T6:
+ decodeRowType6();
+ break;
}
+
int index = 0;
boolean white = true;
+
for (int i = 0; i <= changesCurrentRowCount; i++) {
int nextChange = columns;
+
if (i != changesCurrentRowCount) {
nextChange = changesCurrentRow[i];
}
+
if (nextChange > columns) {
nextChange = columns;
}
@@ -281,6 +304,7 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
if (index % 8 == 0) {
decodedRow[byteIndex] = 0;
}
+
decodedRow[byteIndex] |= (white ? 0 : 1 << (7 - ((index) % 8)));
index++;
}
@@ -295,43 +319,42 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
decodedLength = (index + 7) / 8;
}
- private int decodeRun(Tree tree) throws IOException {
+ private int decodeRun(final Tree tree) throws IOException {
int total = 0;
Node n = tree.root;
+
while (true) {
boolean bit = readBit();
n = n.walk(bit);
- if (n == null)
+
+ if (n == null) {
throw new IOException("Unknown code in Huffman RLE stream");
+ }
if (n.isLeaf) {
total += n.value;
if (n.value < 64) {
return total;
- } else {
+ }
+ else {
n = tree.root;
- continue;
}
}
}
}
- private void resetBuffer() {
+ private void resetBuffer() throws IOException {
for (int i = 0; i < decodedRow.length; i++) {
decodedRow[i] = 0;
}
+
while (true) {
if (bufferPos == -1) {
return;
}
- try {
- boolean skip = readBit();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ readBit();
}
}
@@ -341,22 +364,29 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
private boolean readBit() throws IOException {
if (bufferPos < 0 || bufferPos > 7) {
buffer = in.read();
+
if (buffer == -1) {
throw new EOFException("Unexpected end of Huffman RLE stream");
}
+
bufferPos = 0;
}
boolean isSet;
+
if (fillOrder == TIFFBaseline.FILL_LEFT_TO_RIGHT) {
isSet = ((buffer >> (7 - bufferPos)) & 1) == 1;
- } else {
+ }
+ else {
isSet = ((buffer >> (bufferPos)) & 1) == 1;
}
bufferPos++;
- if (bufferPos > 7)
+
+ if (bufferPos > 7) {
bufferPos = -1;
+ }
+
return isSet;
}
@@ -428,23 +458,25 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
throw new IOException("mark/reset not supported");
}
- static class Node {
+ private static final class Node {
Node left;
Node right;
int value; // > 63 non term.
+
boolean canBeFill = false;
boolean isLeaf = false;
- void set(boolean next, Node node) {
+ void set(final boolean next, final Node node) {
if (!next) {
left = node;
- } else {
+ }
+ else {
right = node;
}
}
- Node walk(boolean next) {
+ Node walk(final boolean next) {
return next ? right : left;
}
@@ -454,51 +486,69 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
}
}
- static class Tree {
- Node root = new Node();
+ private static final class Tree {
+ final Node root = new Node();
- void fill(int depth, int path, int value) throws IOException {
+ void fill(final int depth, final int path, final int value) throws IOException {
Node current = root;
+
for (int i = 0; i < depth; i++) {
int bitPos = depth - 1 - i;
boolean isSet = ((path >> bitPos) & 1) == 1;
Node next = current.walk(isSet);
+
if (next == null) {
next = new Node();
+
if (i == depth - 1) {
next.value = value;
next.isLeaf = true;
}
- if (path == 0)
+
+ if (path == 0) {
next.canBeFill = true;
+ }
+
current.set(isSet, next);
- } else {
- if (next.isLeaf)
- throw new IOException("node is leaf, no other following");
}
+ else {
+ if (next.isLeaf) {
+ throw new IOException("node is leaf, no other following");
+ }
+ }
+
current = next;
}
}
- void fill(int depth, int path, Node node) throws IOException {
+ void fill(final int depth, final int path, final Node node) throws IOException {
Node current = root;
+
for (int i = 0; i < depth; i++) {
int bitPos = depth - 1 - i;
boolean isSet = ((path >> bitPos) & 1) == 1;
Node next = current.walk(isSet);
+
if (next == null) {
if (i == depth - 1) {
next = node;
- } else {
+ }
+ else {
next = new Node();
}
- if (path == 0)
+
+ if (path == 0) {
next.canBeFill = true;
+ }
+
current.set(isSet, next);
- } else {
- if (next.isLeaf)
- throw new IOException("node is leaf, no other following");
}
+ else {
+ if (next.isLeaf) {
+ throw new IOException("node is leaf, no other following");
+ }
+ }
+
current = next;
}
}
@@ -506,105 +556,148 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
static final short[][] BLACK_CODES = {
{ // 2 bits
- 0x2, 0x3, },
+ 0x2, 0x3,
+ },
{ // 3 bits
- 0x2, 0x3, },
+ 0x2, 0x3,
+ },
{ // 4 bits
- 0x2, 0x3, },
+ 0x2, 0x3,
+ },
{ // 5 bits
- 0x3, },
+ 0x3,
+ },
{ // 6 bits
- 0x4, 0x5, },
+ 0x4, 0x5,
+ },
{ // 7 bits
- 0x4, 0x5, 0x7, },
+ 0x4, 0x5, 0x7,
+ },
{ // 8 bits
- 0x4, 0x7, },
+ 0x4, 0x7,
+ },
{ // 9 bits
- 0x18, },
+ 0x18,
+ },
{ // 10 bits
- 0x17, 0x18, 0x37, 0x8, 0xf, },
+ 0x17, 0x18, 0x37, 0x8, 0xf,
+ },
{ // 11 bits
- 0x17, 0x18, 0x28, 0x37, 0x67, 0x68, 0x6c, 0x8, 0xc, 0xd, },
+ 0x17, 0x18, 0x28, 0x37, 0x67, 0x68, 0x6c, 0x8, 0xc, 0xd,
+ },
{ // 12 bits
- 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x1c, 0x1d, 0x1e, 0x1f, 0x24, 0x27, 0x28, 0x2b, 0x2c, 0x33,
- 0x34, 0x35, 0x37, 0x38, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x64, 0x65,
- 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xd2, 0xd3,
- 0xd4, 0xd5, 0xd6, 0xd7, 0xda, 0xdb, },
+ 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x1c, 0x1d, 0x1e, 0x1f, 0x24, 0x27, 0x28, 0x2b, 0x2c, 0x33,
+ 0x34, 0x35, 0x37, 0x38, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x64, 0x65,
+ 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xd2, 0xd3,
+ 0xd4, 0xd5, 0xd6, 0xd7, 0xda, 0xdb,
+ },
{ // 13 bits
- 0x4a, 0x4b, 0x4c, 0x4d, 0x52, 0x53, 0x54, 0x55, 0x5a, 0x5b, 0x64, 0x65, 0x6c, 0x6d, 0x72, 0x73,
- 0x74, 0x75, 0x76, 0x77, } };
+ 0x4a, 0x4b, 0x4c, 0x4d, 0x52, 0x53, 0x54, 0x55, 0x5a, 0x5b, 0x64, 0x65, 0x6c, 0x6d, 0x72, 0x73,
+ 0x74, 0x75, 0x76, 0x77,
+ }
+ };
static final short[][] BLACK_RUN_LENGTHS = {
{ // 2 bits
- 3, 2, },
+ 3, 2,
+ },
{ // 3 bits
- 1, 4, },
+ 1, 4,
+ },
{ // 4 bits
- 6, 5, },
+ 6, 5,
+ },
{ // 5 bits
- 7, },
+ 7,
+ },
{ // 6 bits
- 9, 8, },
+ 9, 8,
+ },
{ // 7 bits
- 10, 11, 12, },
+ 10, 11, 12,
+ },
{ // 8 bits
- 13, 14, },
+ 13, 14,
+ },
{ // 9 bits
- 15, },
+ 15,
+ },
{ // 10 bits
- 16, 17, 0, 18, 64, },
+ 16, 17, 0, 18, 64,
+ },
{ // 11 bits
- 24, 25, 23, 22, 19, 20, 21, 1792, 1856, 1920, },
+ 24, 25, 23, 22, 19, 20, 21, 1792, 1856, 1920,
+ },
{ // 12 bits
- 1984, 2048, 2112, 2176, 2240, 2304, 2368, 2432, 2496, 2560, 52, 55, 56, 59, 60, 320, 384, 448, 53,
- 54, 50, 51, 44, 45, 46, 47, 57, 58, 61, 256, 48, 49, 62, 63, 30, 31, 32, 33, 40, 41, 128, 192, 26,
- 27, 28, 29, 34, 35, 36, 37, 38, 39, 42, 43, },
+ 1984, 2048, 2112, 2176, 2240, 2304, 2368, 2432, 2496, 2560, 52, 55, 56, 59, 60, 320, 384, 448, 53,
+ 54, 50, 51, 44, 45, 46, 47, 57, 58, 61, 256, 48, 49, 62, 63, 30, 31, 32, 33, 40, 41, 128, 192, 26,
+ 27, 28, 29, 34, 35, 36, 37, 38, 39, 42, 43,
+ },
{ // 13 bits
- 640, 704, 768, 832, 1280, 1344, 1408, 1472, 1536, 1600, 1664, 1728, 512, 576, 896, 960, 1024, 1088,
- 1152, 1216, } };
+ 640, 704, 768, 832, 1280, 1344, 1408, 1472, 1536, 1600, 1664, 1728, 512, 576, 896, 960, 1024, 1088,
+ 1152, 1216,
+ }
+ };
public static final short[][] WHITE_CODES = {
{ // 4 bits
- 0x7, 0x8, 0xb, 0xc, 0xe, 0xf, },
+ 0x7, 0x8, 0xb, 0xc, 0xe, 0xf,
+ },
{ // 5 bits
- 0x12, 0x13, 0x14, 0x1b, 0x7, 0x8, },
+ 0x12, 0x13, 0x14, 0x1b, 0x7, 0x8,
+ },
{ // 6 bits
- 0x17, 0x18, 0x2a, 0x2b, 0x3, 0x34, 0x35, 0x7, 0x8, },
+ 0x17, 0x18, 0x2a, 0x2b, 0x3, 0x34, 0x35, 0x7, 0x8,
+ },
{ // 7 bits
- 0x13, 0x17, 0x18, 0x24, 0x27, 0x28, 0x2b, 0x3, 0x37, 0x4, 0x8, 0xc, },
+ 0x13, 0x17, 0x18, 0x24, 0x27, 0x28, 0x2b, 0x3, 0x37, 0x4, 0x8, 0xc,
+ },
{ // 8 bits
- 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x1a, 0x1b, 0x2, 0x24, 0x25, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
- 0x3, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x4, 0x4a, 0x4b, 0x5, 0x52, 0x53, 0x54, 0x55, 0x58, 0x59,
- 0x5a, 0x5b, 0x64, 0x65, 0x67, 0x68, 0xa, 0xb, },
+ 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x1a, 0x1b, 0x2, 0x24, 0x25, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
+ 0x3, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x4, 0x4a, 0x4b, 0x5, 0x52, 0x53, 0x54, 0x55, 0x58, 0x59,
+ 0x5a, 0x5b, 0x64, 0x65, 0x67, 0x68, 0xa, 0xb,
+ },
{ // 9 bits
- 0x98, 0x99, 0x9a, 0x9b, 0xcc, 0xcd, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, },
+ 0x98, 0x99, 0x9a, 0x9b, 0xcc, 0xcd, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
+ },
{ // 10 bits
},
{ // 11 bits
- 0x8, 0xc, 0xd, },
+ 0x8, 0xc, 0xd,
+ },
{ // 12 bits
- 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x1c, 0x1d, 0x1e, 0x1f, } };
+ 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x1c, 0x1d, 0x1e, 0x1f,
+ }
+ };
public static final short[][] WHITE_RUN_LENGTHS = {
{ // 4 bits
- 2, 3, 4, 5, 6, 7, },
+ 2, 3, 4, 5, 6, 7,
+ },
{ // 5 bits
- 128, 8, 9, 64, 10, 11, },
+ 128, 8, 9, 64, 10, 11,
+ },
{ // 6 bits
- 192, 1664, 16, 17, 13, 14, 15, 1, 12, },
+ 192, 1664, 16, 17, 13, 14, 15, 1, 12,
+ },
{ // 7 bits
- 26, 21, 28, 27, 18, 24, 25, 22, 256, 23, 20, 19, },
+ 26, 21, 28, 27, 18, 24, 25, 22, 256, 23, 20, 19,
+ },
{ // 8 bits
- 33, 34, 35, 36, 37, 38, 31, 32, 29, 53, 54, 39, 40, 41, 42, 43, 44, 30, 61, 62, 63, 0, 320, 384, 45,
- 59, 60, 46, 49, 50, 51, 52, 55, 56, 57, 58, 448, 512, 640, 576, 47, 48, },
- { // 9
- // bits
- 1472, 1536, 1600, 1728, 704, 768, 832, 896, 960, 1024, 1088, 1152, 1216, 1280, 1344, 1408, },
+ 33, 34, 35, 36, 37, 38, 31, 32, 29, 53, 54, 39, 40, 41, 42, 43, 44, 30, 61, 62, 63, 0, 320, 384, 45,
+ 59, 60, 46, 49, 50, 51, 52, 55, 56, 57, 58, 448, 512, 640, 576, 47, 48,
+ },
+ { // 9 bits
+ 1472, 1536, 1600, 1728, 704, 768, 832, 896, 960, 1024, 1088, 1152, 1216, 1280, 1344, 1408,
+ },
{ // 10 bits
},
{ // 11 bits
- 1792, 1856, 1920, },
+ 1792, 1856, 1920,
+ },
{ // 12 bits
- 1984, 2048, 2112, 2176, 2240, 2304, 2368, 2432, 2496, 2560, } };
+ 1984, 2048, 2112, 2176, 2240, 2304, 2368, 2432, 2496, 2560,
+ }
+ };
final static Node EOL;
final static Node FILL;
@@ -631,8 +724,9 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
try {
eolOnlyTree.fill(12, 0, FILL);
eolOnlyTree.fill(12, 1, EOL);
- } catch (Exception e) {
- e.printStackTrace();
+ }
+ catch (IOException e) {
+ throw new AssertionError(e);
}
blackRunTree = new Tree();
@@ -644,9 +738,11 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
}
blackRunTree.fill(12, 0, FILL);
blackRunTree.fill(12, 1, EOL);
- } catch (Exception e) {
- e.printStackTrace();
}
+ catch (IOException e) {
+ throw new AssertionError(e);
+ }
+
whiteRunTree = new Tree();
try {
for (int i = 0; i < WHITE_CODES.length; i++) {
@@ -654,10 +750,12 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
whiteRunTree.fill(i + 4, WHITE_CODES[i][j], WHITE_RUN_LENGTHS[i][j]);
}
}
+
whiteRunTree.fill(12, 0, FILL);
whiteRunTree.fill(12, 1, EOL);
- } catch (Exception e) {
- e.printStackTrace();
+ }
+ catch (IOException e) {
+ throw new AssertionError(e);
}
codeTree = new Tree();
@@ -671,8 +769,9 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
codeTree.fill(3, 2, -1); // V_L(1)
codeTree.fill(6, 2, -2); // V_L(2)
codeTree.fill(7, 2, -3); // V_L(3)
- } catch (Exception e) {
- e.printStackTrace();
+ }
+ catch (IOException e) {
+ throw new AssertionError(e);
}
}
}
diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFExtension.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFExtension.java
index c799fc6f..f6444464 100644
--- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFExtension.java
+++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFExtension.java
@@ -62,6 +62,8 @@ interface TIFFExtension {
int PREDICTOR_HORIZONTAL_DIFFERENCING = 2;
int PREDICTOR_HORIZONTAL_FLOATINGPOINT = 3;
+ int FILL_RIGHT_TO_LEFT = 2;
+
int SAMPLEFORMAT_INT = 2;
int SAMPLEFORMAT_FP = 3;
int SAMPLEFORMAT_UNDEFINED = 4;