TMI-143: Support for CMYK JPEG in TIFF.

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java

@@ -585,6 +585,7 @@ public class TIFFImageReader extends ImageReaderBase {
         int tilesAcross = (width + stripTileWidth - 1) / stripTileWidth;
         int tilesDown = (height + stripTileHeight - 1) / stripTileHeight;
         WritableRaster rowRaster = rawType.getColorModel().createCompatibleWritableRaster(stripTileWidth, 1);
+        Rectangle clip = new Rectangle(srcRegion);
         int row = 0;
 
         switch (compression) {
@@ -704,7 +705,6 @@ public class TIFFImageReader extends ImageReaderBase {
                         }
 
                         // Clip the stripTile rowRaster to not exceed the srcRegion
-                        Rectangle clip = new Rectangle(srcRegion);
                         clip.width = Math.min((colsInTile + xSub - 1) / xSub, srcRegion.width);
                         Raster clippedRow = clipRowToRect(rowRaster, clip,
                                 param != null ? param.getSourceBands() : null,
@@ -778,11 +778,18 @@ public class TIFFImageReader extends ImageReaderBase {
                             try {
                                 jpegReader.setInput(subStream);
                                 jpegParam.setSourceRegion(new Rectangle(0, 0, colsInTile, rowsInTile));
-                                jpegParam.setDestinationOffset(new Point(col - srcRegion.x, row - srcRegion.y));
+
-                                jpegParam.setDestination(destination);
+                                if (interpretation == TIFFExtension.PHOTOMETRIC_YCBCR) {
-                                // TODO: This works only if Gray/YCbCr/RGB, not CMYK/LAB/etc...
+                                    jpegParam.setDestinationOffset(new Point(col - srcRegion.x, row - srcRegion.y));
-                                // In the latter case we will have to use readAsRaster and do color conversion ourselves
+                                    jpegParam.setDestination(destination);
-                                jpegReader.read(0, jpegParam);
+                                    jpegReader.read(0, jpegParam);
+                                }
+                                else {
+                                    // Otherwise, it's likely CMYK or some other interpretation we don't need to convert.
+                                    // We'll have to use readAsRaster and later apply color space conversion ourselves
+                                    Raster raster = jpegReader.readRaster(0, jpegParam);
+                                    destination.getRaster().setDataElements(col - srcRegion.x, row - srcRegion.y, raster);
+                                }
                             }
                             finally {
                                 subStream.close();
@@ -888,10 +895,17 @@ public class TIFFImageReader extends ImageReaderBase {
 
                     try {
                         jpegParam.setSourceRegion(new Rectangle(0, 0, width, height));
-                        jpegParam.setDestination(destination);
+
-                        // TODO: This works only if Gray/YCbCr/RGB, not CMYK/LAB/etc...
+                        if (interpretation == TIFFExtension.PHOTOMETRIC_YCBCR) {
-                        // In the latter case we will have to use readAsRaster and do color conversion ourselves
+                            jpegParam.setDestination(destination);
-                        jpegReader.read(0, jpegParam);
+                            jpegReader.read(0, jpegParam);
+                        }
+                        else {
+                            // Otherwise, it's likely CMYK or some other interpretation we don't need to convert.
+                            // We'll have to use readAsRaster and later apply color space conversion ourselves
+                            Raster raster = jpegReader.readRaster(0, jpegParam);
+                            destination.getRaster().setDataElements(0, 0, raster);
+                        }
                     }
                     finally {
                         stream.close();
@@ -1064,7 +1078,7 @@ public class TIFFImageReader extends ImageReaderBase {
         // If we can't get the standard reader, fall back to the default (first) reader
         Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName("JPEG");
         if (!readers.hasNext()) {
-            throw new IIOException("Could not instantiate JPEGImageReader. ");
+            throw new IIOException("Could not instantiate JPEGImageReader");
         }
 
         return readers.next();
@@ -1181,9 +1195,7 @@ public class TIFFImageReader extends ImageReaderBase {
                         // Subsample horizontal
                         if (xSub != 1) {
                             for (int x = srcRegion.x / xSub * numBands; x < ((srcRegion.x + srcRegion.width) / xSub) * numBands; x += numBands) {
-                                for (int b = 0; b < numBands; b++) {
+                                System.arraycopy(rowDataByte, x * xSub, rowDataByte, x, numBands);
-                                    rowDataByte[x + b] = rowDataByte[x * xSub + b];
-                                }
                             }
                         }
 
@@ -1212,13 +1224,13 @@ public class TIFFImageReader extends ImageReaderBase {
                         // Subsample horizontal
                         if (xSub != 1) {
                             for (int x = srcRegion.x / xSub * numBands; x < ((srcRegion.x + srcRegion.width) / xSub) * numBands; x += numBands) {
-                                for (int b = 0; b < numBands; b++) {
+                                System.arraycopy(rowDataShort, x * xSub, rowDataShort, x, numBands);
-                                    rowDataShort[x + b] = rowDataShort[x * xSub + b];
-                                }
                             }
                         }
 
                         raster.setDataElements(startCol, row - srcRegion.y, tileRowRaster);
+                        // TODO: Possible speedup ~30%!:
+//                        raster.setDataElements(startCol, row - srcRegion.y, colsInTile, 1, rowDataShort);
                     }
                     // Else skip data
                 }
@@ -1240,9 +1252,7 @@ public class TIFFImageReader extends ImageReaderBase {
                         // Subsample horizontal
                         if (xSub != 1) {
                             for (int x = srcRegion.x / xSub * numBands; x < ((srcRegion.x + srcRegion.width) / xSub) * numBands; x += numBands) {
-                                for (int b = 0; b < numBands; b++) {
+                                System.arraycopy(rowDataInt, x * xSub, rowDataInt, x, numBands);
-                                    rowDataInt[x + b] = rowDataInt[x * xSub + b];
-                                }
                             }
                         }
 

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

@@ -78,7 +78,9 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
                 new TestData(getClassLoaderResource("/tiff/test-single-gray-compression-type-2.tiff"), new Dimension(1728, 1146)), // Gray, CCITT type 2 compressed
                 new TestData(getClassLoaderResource("/tiff/cramps-tile.tif"), new Dimension(800, 607)), // Gray/WhiteIsZero, uncompressed, striped & tiled...
                 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.tif"), new Dimension(100, 100)) // CMYK, JPEG compressed, with ICC profile
         );
     }