From d4e34d610993c11556a4e54ecf6fdf7ff8b07d70 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Tue, 25 Aug 2015 14:13:35 +0200
Subject: [PATCH] TMI #170 Fix General CMM error517/LCMS error 13 (Ignore
 incompatible ICC profile)

---
 .../imageio/plugins/tiff/TIFFImageReader.java | 19 ++++++---
 .../plugins/tiff/TIFFImageReaderTest.java     | 40 +++++++++++--------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
index ef63f25e..781df46a 100755
--- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
+++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
@@ -61,6 +61,7 @@ import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.spi.ServiceRegistry;
 import javax.imageio.stream.ImageInputStream;
 import java.awt.*;
+import java.awt.color.CMMException;
 import java.awt.color.ColorSpace;
 import java.awt.color.ICC_Profile;
 import java.awt.image.*;
@@ -1562,14 +1563,22 @@ public class TIFFImageReader extends ImageReaderBase {
         return value;
     }
 
-    public ICC_Profile getICCProfile() {
+    private ICC_Profile getICCProfile() {
         Entry entry = currentIFD.getEntryById(TIFF.TAG_ICC_PROFILE);
-        if (entry == null) {
-            return null;
+
+        if (entry != null) {
+            byte[] value = (byte[]) entry.getValue();
+            ICC_Profile profile = ICC_Profile.getInstance(value);
+
+            try {
+                return ColorSpaces.validateProfile(profile);
+            }
+            catch (CMMException ignore) {
+                processWarningOccurred("Ignoring broken/incompatible ICC profile: " + ignore.getMessage());
+            }
         }
 
-        byte[] value = (byte[]) entry.getValue();
-        return ICC_Profile.getInstance(value);
+        return null;
     }
 
     // TODO: Tiling support
diff --git a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
index 0dbda095..f5e02935 100644
--- a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
+++ b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
@@ -84,6 +84,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
                 new TestData(getClassLoaderResource("/tiff/grayscale-alpha.tiff"), new Dimension(248, 351)), // Gray + unassociated alpha
                 new TestData(getClassLoaderResource("/tiff/signed-integral-8bit.tif"), new Dimension(439, 167)), // Gray, 8 bit *signed* integral
                 new TestData(getClassLoaderResource("/tiff/floatingpoint-32bit.tif"), new Dimension(300, 100)), // RGB, 32 bit floating point
+                new TestData(getClassLoaderResource("/tiff/general-cmm-error.tif"), new Dimension(1181, 860)), // RGB, LZW compression with broken/incompatible 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
@@ -152,9 +153,8 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
     @Test
     public void testReadOldStyleJPEGGrayscale() throws IOException {
         TestData testData = new TestData(getClassLoaderResource("/tiff/grayscale-old-style-jpeg.tiff"), new Dimension(600, 600));
-        ImageInputStream stream = testData.getInputStream();
 
-        try {
+        try (ImageInputStream stream = testData.getInputStream()) {
             TIFFImageReader reader = createReader();
             reader.setInput(stream);
             BufferedImage image = reader.read(0);
@@ -162,18 +162,13 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
             assertNotNull(image);
             assertEquals(testData.getDimension(0), new Dimension(image.getWidth(), image.getHeight()));
         }
-        finally {
-            stream.close();
-        }
     }
 
     @Test
     public void testReadIncompatibleICCProfileIgnoredWithWarning() throws IOException {
         TestData testData = new TestData(getClassLoaderResource("/tiff/rgb-with-embedded-cmyk-icc.tif"), new Dimension(1500, 1500));
 
-        ImageInputStream stream = testData.getInputStream();
-
-        try {
+        try (ImageInputStream stream = testData.getInputStream()) {
             TIFFImageReader reader = createReader();
             reader.setInput(stream);
 
@@ -186,18 +181,13 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
             assertEquals(testData.getDimension(0), new Dimension(image.getWidth(), image.getHeight()));
             verify(warningListener, atLeastOnce()).warningOccurred(eq(reader), contains("ICC"));
         }
-        finally {
-            stream.close();
-        }
     }
 
     @Test
     public void testColorMap8Bit() throws IOException {
         TestData testData = new TestData(getClassLoaderResource("/tiff/scan-lzw-8bit-colormap.tiff"), new Dimension(2550, 3300));
 
-        ImageInputStream stream = testData.getInputStream();
-
-        try {
+        try (ImageInputStream stream = testData.getInputStream()) {
             TIFFImageReader reader = createReader();
             reader.setInput(stream);
 
@@ -213,8 +203,26 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
             assertEquals(0xffffffff, image.getRGB(0, 0)); // The pixel at 0, 0 should be white, not black
             verify(warningListener, atLeastOnce()).warningOccurred(eq(reader), contains("ColorMap"));
         }
-        finally {
-            stream.close();
+    }
+
+    @Test
+    public void testBadICCProfile() throws IOException {
+        TestData testData = new TestData(getClassLoaderResource("/tiff/general-cmm-error.tif"), new Dimension(1181, 864));
+
+        try (ImageInputStream stream = testData.getInputStream()) {
+            TIFFImageReader reader = createReader();
+            reader.setInput(stream);
+
+            IIOReadWarningListener warningListener = mock(IIOReadWarningListener.class);
+            reader.addIIOReadWarningListener(warningListener);
+
+            ImageReadParam param = reader.getDefaultReadParam();
+            param.setSourceRegion(new Rectangle(8, 8));
+            BufferedImage image = reader.read(0, param);
+
+            assertNotNull(image);
+            assertEquals(new Dimension(8, 8), new Dimension(image.getWidth(), image.getHeight()));
+            verify(warningListener, atLeastOnce()).warningOccurred(eq(reader), contains("ICC profile"));
         }
     }
 }