Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-03 03:25:28 -04:00
Code Issues Projects Releases Wiki Activity

TMI #237: Fix for CCITT images with more b/w changes than columns

Browse Source
This commit is contained in:
Oliver Schmidtmer 2016-05-07 01:06:53 +02:00
parent e0434a1dcb
commit fa0341f302
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,8 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
fillOrder, "Expected fill order 1 or 2: %s"
);
this.changesReferenceRow = new int[columns];
this.changesCurrentRow = new int[columns];
this.changesReferenceRow = new int[columns + 1];
this.changesCurrentRow = new int[columns + 1];
switch (type) {
case TIFFExtension.COMPRESSION_CCITT_T4:

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

@ -33,13 +33,11 @@ import org.junit.Test;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferByte;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.util.Arrays;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
/**
* CCITTFaxDecoderStreamTest
@ -229,4 +227,20 @@ public class CCITTFaxDecoderStreamTest {
// Ideally, we should have no more data now, but the stream don't know that...
// assertEquals("Should contain no more data", -1, stream.read());
}
@Test
public void testMoreChangesThanColumns() throws IOException {
// Produces an CCITT Stream with 9 changes on 8 columns.
byte[] data = new byte[] {(byte) 0b10101010};
ByteArrayOutputStream imageOutput = new ByteArrayOutputStream();
OutputStream outputSteam = new CCITTFaxEncoderStream(imageOutput, 8, 1, TIFFExtension.COMPRESSION_CCITT_T6, 1, 0L);
outputSteam.write(data);
outputSteam.close();
byte[] encoded = imageOutput.toByteArray();
InputStream inputStream = new CCITTFaxDecoderStream(new ByteArrayInputStream(encoded), 8,
TIFFExtension.COMPRESSION_CCITT_T6, 1, 0L);
byte decoded = (byte) inputStream.read();
assertEquals(data[0], decoded);
}
}