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

#306 TIFF LZW write EOF issue

Browse Source 
(cherry picked from commit 94d6ad1)
This commit is contained in:
Harald Kuhr 2017-01-19 16:10:54 +01:00
parent 69dcfe9713
commit c0f66b5584
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
View File

@ -571,7 +571,7 @@ public final class TIFFImageWriter extends ImageWriterBase {
case TIFFExtension.COMPRESSION_LZW: case TIFFExtension.COMPRESSION_LZW:
stream = IIOUtil.createStreamAdapter(imageOutput); stream = IIOUtil.createStreamAdapter(imageOutput);
stream = new EncoderStream(stream, new LZWEncoder((image.getTileWidth() * image.getTileHeight() * samplesPerPixel * bitPerSample + 7) / 8)); stream = new EncoderStream(stream, new LZWEncoder(((image.getTileWidth() * samplesPerPixel * bitPerSample + 7) / 8) * image.getTileHeight()));
if (entries.containsKey(TIFF.TAG_PREDICTOR) && entries.get(TIFF.TAG_PREDICTOR).getValue().equals(TIFFExtension.PREDICTOR_HORIZONTAL_DIFFERENCING)) { if (entries.containsKey(TIFF.TAG_PREDICTOR) && entries.get(TIFF.TAG_PREDICTOR).getValue().equals(TIFFExtension.PREDICTOR_HORIZONTAL_DIFFERENCING)) {
stream = new HorizontalDifferencingStream(stream, image.getTileWidth(), samplesPerPixel, bitPerSample, imageOutput.getByteOrder()); stream = new HorizontalDifferencingStream(stream, image.getTileWidth(), samplesPerPixel, bitPerSample, imageOutput.getByteOrder());
} }

41
imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterTest.java
View File

@ -905,6 +905,45 @@ public class TIFFImageWriterTest extends ImageWriterAbstractTestCase {
getClassLoaderResource("/tiff/ColorCheckerCalculator.tif"), getClassLoaderResource("/tiff/ColorCheckerCalculator.tif"),
getClassLoaderResource("/tiff/quad-jpeg.tif"), getClassLoaderResource("/tiff/quad-jpeg.tif"),
getClassLoaderResource("/tiff/quad-lzw.tif"), getClassLoaderResource("/tiff/quad-lzw.tif"),
getClassLoaderResource("/tiff/bali.tif"),
getClassLoaderResource("/tiff/lzw-colormap-iiobe.tif"),
// TODO: FixMe for ColorMap + ExtraSamples (custom ColorModel)
// getClassLoaderResource("/tiff/colormap-with-extrasamples.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-02.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-04.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-06.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-08.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-10.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-12.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-14.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-16.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-24.tif"),
getClassLoaderResource("/tiff/depth/flower-minisblack-32.tif"),
getClassLoaderResource("/tiff/depth/flower-palette-02.tif"),
getClassLoaderResource("/tiff/depth/flower-palette-04.tif"),
getClassLoaderResource("/tiff/depth/flower-palette-08.tif"),
getClassLoaderResource("/tiff/depth/flower-palette-16.tif"),
getClassLoaderResource("/tiff/depth/flower-rgb-contig-08.tif"),
// TODO: FixMe for RGB > 8 bits / sample
// getClassLoaderResource("/tiff/depth/flower-rgb-contig-10.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-contig-12.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-contig-14.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-contig-16.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-contig-24.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-contig-32.tif"),
getClassLoaderResource("/tiff/depth/flower-rgb-planar-08.tif"),
// TODO: FixMe for planar RGB > 8 bits / sample
// getClassLoaderResource("/tiff/depth/flower-rgb-planar-10.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-planar-12.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-planar-14.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-planar-16.tif"),
// getClassLoaderResource("/tiff/depth/flower-rgb-planar-24.tif"),
getClassLoaderResource("/tiff/scan-mono-iccgray.tif"),
getClassLoaderResource("/tiff/old-style-jpeg-inconsistent-metadata.tif"), getClassLoaderResource("/tiff/old-style-jpeg-inconsistent-metadata.tif"),
getClassLoaderResource("/tiff/ccitt/group3_1d.tif"), getClassLoaderResource("/tiff/ccitt/group3_1d.tif"),
getClassLoaderResource("/tiff/ccitt/group3_2d.tif"), getClassLoaderResource("/tiff/ccitt/group3_2d.tif"),
@ -971,7 +1010,7 @@ public class TIFFImageWriterTest extends ImageWriterAbstractTestCase {
if (info.compression == TIFFExtension.COMPRESSION_OLD_JPEG) { if (info.compression == TIFFExtension.COMPRESSION_OLD_JPEG) {
// Should rewrite this from old-style to new style // Should rewrite this from old-style to new style
assertEquals("Old JPEG compression not rewritten as JPEG", TIFFExtension.COMPRESSION_JPEG, afterCompressionEntry.getValue()); assertEquals("Old JPEG compression not rewritten as JPEG", TIFFExtension.COMPRESSION_JPEG, ((Number) afterCompressionEntry.getValue()).intValue());
} }
else { else {
assertEquals("Compression differs from original", info.compression, ((Number) afterCompressionEntry.getValue()).intValue()); assertEquals("Compression differs from original", info.compression, ((Number) afterCompressionEntry.getValue()).intValue());