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

TMI#159: Clean-up after merge + added test cases for the CCITT images.

Browse Source
This commit is contained in:
Harald Kuhr 2015-08-14 09:58:15 +02:00
parent 40b11710ea
commit 077e40acf2
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,24 +183,31 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
case VALUE_PASSMODE: case VALUE_PASSMODE:
int pChangingElement = getNextChangingElement(index, white) + 1; int pChangingElement = getNextChangingElement(index, white) + 1;
if(pChangingElement >= changesReferenceRowCount || pChangingElement == -1){
if (pChangingElement >= changesReferenceRowCount || pChangingElement == -1) {
index = columns; index = columns;
}else{ }
else {
index = changesReferenceRow[pChangingElement]; index = changesReferenceRow[pChangingElement];
} }
break; break;
default: default:
// Vertical mode (-3 to 3) // Vertical mode (-3 to 3)
int vChangingElement = getNextChangingElement(index, white); int vChangingElement = getNextChangingElement(index, white);
if(vChangingElement >= changesReferenceRowCount || vChangingElement == -1){
if (vChangingElement >= changesReferenceRowCount || vChangingElement == -1) {
index = columns + n.value; index = columns + n.value;
}else{
index = changesReferenceRow[vChangingElement]+ n.value;
} }
else {
index = changesReferenceRow[vChangingElement] + n.value;
}
changesCurrentRow[changesCurrentRowCount] = index; changesCurrentRow[changesCurrentRowCount] = index;
changesCurrentRowCount++; changesCurrentRowCount++;
white = !white; white = !white;
break; break;
} }

10
imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
View File

@ -80,7 +80,15 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
new TestData(getClassLoaderResource("/tiff/lzw-long-strings-sample.tif"), new Dimension(316, 173)), // RGBA, LZW compressed w/predictor new TestData(getClassLoaderResource("/tiff/lzw-long-strings-sample.tif"), new Dimension(316, 173)), // RGBA, LZW compressed w/predictor
new TestData(getClassLoaderResource("/tiff/part.tif"), new Dimension(50, 50)), // Gray/BlackIsZero, uncompressed, striped signed int (SampleFormat 2) new TestData(getClassLoaderResource("/tiff/part.tif"), new Dimension(50, 50)), // Gray/BlackIsZero, uncompressed, striped signed int (SampleFormat 2)
new TestData(getClassLoaderResource("/tiff/cmyk_jpeg_no_profile.tif"), new Dimension(150, 63)), // CMYK, JPEG compressed, no ICC profile new TestData(getClassLoaderResource("/tiff/cmyk_jpeg_no_profile.tif"), new Dimension(150, 63)), // CMYK, JPEG compressed, no ICC profile
new TestData(getClassLoaderResource("/tiff/cmyk_jpeg.tif"), new Dimension(100, 100)) // CMYK, JPEG compressed, with ICC profile new TestData(getClassLoaderResource("/tiff/cmyk_jpeg.tif"), new Dimension(100, 100)), // CMYK, JPEG compressed, with ICC profile
// CCITT
new TestData(getClassLoaderResource("/tiff/ccitt/group3_1d.tif"), new Dimension(6, 4)), // B/W, CCITT T4 1D
new TestData(getClassLoaderResource("/tiff/ccitt/group3_1d_fill.tif"), new Dimension(6, 4)), // B/W, CCITT T4 1D
new TestData(getClassLoaderResource("/tiff/ccitt/group3_2d.tif"), new Dimension(6, 4)), // B/W, CCITT T4 2D
new TestData(getClassLoaderResource("/tiff/ccitt/group3_2d_fill.tif"), new Dimension(6, 4)), // B/W, CCITT T4 2D
new TestData(getClassLoaderResource("/tiff/ccitt/group3_2d_lsb2msb.tif"), new Dimension(6, 4)), // B/W, CCITT T4 2D, LSB
new TestData(getClassLoaderResource("/tiff/ccitt/group4.tif"), new Dimension(6, 4)), // B/W, CCITT T6 1D
new TestData(getClassLoaderResource("/tiff/fivepages-scan-causingerrors.tif"), new Dimension(2480, 3518)) // B/W, CCITT T4
); );
} }

BIN
imageio/imageio-tiff/src/test/resources/tiff/fivepages-scan-causingerrors.tif Normal file
View File

Binary file not shown.