#326: Support for JFIF JPEG with non-spec 8 bit grayscale thumbnail.

imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReaderTest.java

@@ -41,9 +41,7 @@ import java.io.IOException;
 import java.util.List;
 
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
 
 /**
  * JFIFThumbnailReaderTest
@@ -78,6 +76,20 @@ public class JFIFThumbnailReaderTest extends AbstractThumbnailReaderTest {
         assertEquals(122, thumbnail.getHeight());
     }
 
+    @Test
+    public void testReadNonSpecGray() throws IOException {
+        ThumbnailReader reader = createReader(mock(ThumbnailReadProgressListener.class), 0, 0, createStream("/jpeg/jfif-grayscale-thumbnail.jpg"));
+
+        assertEquals(127, reader.getWidth());
+        assertEquals(76, reader.getHeight());
+
+        BufferedImage thumbnail = reader.read();
+        assertNotNull(thumbnail);
+        assertEquals(BufferedImage.TYPE_BYTE_GRAY, thumbnail.getType());
+        assertEquals(127, thumbnail.getWidth());
+        assertEquals(76, thumbnail.getHeight());
+    }
+
     @Test
     public void testProgressListenerRaw() throws IOException {
         ThumbnailReadProgressListener listener = mock(ThumbnailReadProgressListener.class);

imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java

@@ -97,6 +97,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
                 new TestData(getClassLoaderResource("/jpeg/jfif-bogus-empty-jfif-segment.jpg"), new Dimension(942, 714)),
                 new TestData(getClassLoaderResource("/jpeg/app-marker-missing-null-term.jpg"), new Dimension(200, 150)),
                 new TestData(getClassLoaderResource("/jpeg/jfif-16bit-dqt.jpg"), new Dimension(204, 131)),
+                new TestData(getClassLoaderResource("/jpeg/jfif-grayscale-thumbnail.jpg"), new Dimension(2547, 1537)), // Non-compliant JFIF with 8 bit grayscale thumbnail
                 new TestData(getClassLoaderResource("/jpeg-lossless/8_ls.jpg"), new Dimension(800, 535)),  // Lossless gray, 8 bit
                 new TestData(getClassLoaderResource("/jpeg-lossless/16_ls.jpg"), new Dimension(800, 535)),  // Lossless gray, 16 bit
                 new TestData(getClassLoaderResource("/jpeg-lossless/24_ls.jpg"), new Dimension(800, 535)), // Lossless RGB, 8 bit per component (24 bit)