#248 PSDImageReader now uses correct band indices for grayscale + alpha layers.

imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java

@@ -267,6 +267,20 @@ public final class PSDImageReader extends ImageReaderBase {
         List<ImageTypeSpecifier> types = new ArrayList<>();
 
         switch (header.mode) {
+            case PSD.COLOR_MODE_GRAYSCALE:
+                if (rawType.getNumBands() == 1 && rawType.getBitsPerBand(0) == 8) {
+                    types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY));
+                }
+                else if (rawType.getNumBands() >= 2 && rawType.getBitsPerBand(0) == 8) {
+                    types.add(ImageTypeSpecifiers.createInterleaved(cs, new int[] {1, 0}, DataBuffer.TYPE_BYTE, true, false));
+                }
+                else if (rawType.getNumBands() == 1 && rawType.getBitsPerBand(0) == 16) {
+                    types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_USHORT_GRAY));
+                }
+                else if (rawType.getNumBands() >= 2 && rawType.getBitsPerBand(0) == 16) {
+                    types.add(ImageTypeSpecifiers.createInterleaved(cs, new int[] {1, 0}, DataBuffer.TYPE_USHORT, true, false));
+                }
+                break;
             case PSD.COLOR_MODE_RGB:
                 // Prefer interleaved versions as they are much faster to display
                 if (rawType.getNumBands() == 3 && rawType.getBitsPerBand(0) == 8) {
@@ -283,7 +297,7 @@ public final class PSDImageReader extends ImageReaderBase {
                     // TODO: Integer raster
                     // types.add(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.INT_ARGB));
                     types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_4BYTE_ABGR));
-//
+
                     if (!cs.isCS_sRGB()) {
                         // Basically BufferedImage.TYPE_4BYTE_ABGR, with corrected ColorSpace. Possibly slow.
                         types.add(ImageTypeSpecifiers.createInterleaved(cs, new int[] {3, 2, 1, 0}, DataBuffer.TYPE_BYTE, true, false));
@@ -1116,7 +1130,7 @@ public final class PSDImageReader extends ImageReaderBase {
             if (newBandNum > compositeType.getNumBands()) {
                 int[] indices = new int[newBandNum];
                 for (int i = 0, indicesLength = indices.length; i < indicesLength; i++) {
-                    indices[i] = indicesLength - i;
+                    indices[i] = i;
                 }
 
                 int[] offs = new int[newBandNum];

imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTest.java

@@ -138,7 +138,8 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
     public void testThumbnailReading() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        imageReader.setInput(getTestData().get(0).getInputStream());
+        try (ImageInputStream stream = getTestData().get(0).getInputStream()) {
+            imageReader.setInput(stream);
 
             assertEquals(1, imageReader.getNumThumbnails(0));
 
@@ -148,6 +149,7 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
             assertEquals(128, thumbnail.getWidth());
             assertEquals(96, thumbnail.getHeight());
         }
+    }
 
     @Test
     public void testThumbnailReadingNoInput() throws IOException {
@@ -190,7 +192,8 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
     public void testThumbnailReadingOutOfBounds() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        imageReader.setInput(getTestData().get(0).getInputStream());
+        try (ImageInputStream stream = getTestData().get(0).getInputStream()) {
+            imageReader.setInput(stream);
 
             int numImages = imageReader.getNumImages(true);
 
@@ -227,43 +230,47 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
                 assertTrue(expected.getMessage(), expected.getMessage().toLowerCase().contains("index"));
             }
         }
+    }
 
     @Test
     public void testThumbnailDimensions() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        imageReader.setInput(getTestData().get(0).getInputStream());
+        try (ImageInputStream stream = getTestData().get(0).getInputStream()) {
+            imageReader.setInput(stream);
 
             assertEquals(1, imageReader.getNumThumbnails(0));
 
             assertEquals(128, imageReader.getThumbnailWidth(0, 0));
             assertEquals(96, imageReader.getThumbnailHeight(0, 0));
         }
+    }
 
     @Test
     public void testThumbnailReadListeners() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        imageReader.setInput(getTestData().get(0).getInputStream());
+        try (ImageInputStream stream = getTestData().get(0).getInputStream()) {
+            imageReader.setInput(stream);
 
-        final List<Object> sequnce = new ArrayList<>();
+            final List<Object> seqeunce = new ArrayList<>();
             imageReader.addIIOReadProgressListener(new ProgressListenerBase() {
                 private float mLastPercentageDone = 0;
 
                 @Override
                 public void thumbnailStarted(final ImageReader pSource, final int pImageIndex, final int pThumbnailIndex) {
-                sequnce.add("started");
+                    seqeunce.add("started");
                 }
 
                 @Override
                 public void thumbnailComplete(final ImageReader pSource) {
-                sequnce.add("complete");
+                    seqeunce.add("complete");
                 }
 
                 @Override
                 public void thumbnailProgress(final ImageReader pSource, final float pPercentageDone) {
                     // Optional
-                assertTrue("Listener invoked out of sequence", sequnce.size() == 1);
+                    assertTrue("Listener invoked out of sequence", seqeunce.size() == 1);
                     assertTrue(pPercentageDone >= mLastPercentageDone);
                 }
             });
@@ -271,16 +278,18 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
             BufferedImage thumbnail = imageReader.readThumbnail(0, 0);
             assertNotNull(thumbnail);
 
-        assertEquals("Listeners not invoked", 2, sequnce.size());
+            assertEquals("Listeners not invoked", 2, seqeunce.size());
-        assertEquals("started", sequnce.get(0));
+            assertEquals("started", seqeunce.get(0));
-        assertEquals("complete", sequnce.get(1));
+            assertEquals("complete", seqeunce.get(1));
+        }
     }
 
     @Test
     public void testReadLayers() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        imageReader.setInput(getTestData().get(3).getInputStream());
+        try (ImageInputStream stream = getTestData().get(3).getInputStream()) {
+            imageReader.setInput(stream);
 
             int numImages = imageReader.getNumImages(true);
 
@@ -295,17 +304,18 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
                 assertEquals(image.getHeight(), imageReader.getHeight(i));
             }
         }
+    }
 
     @Test
     public void testImageTypesLayers() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        imageReader.setInput(getTestData().get(3).getInputStream());
+        try (ImageInputStream stream = getTestData().get(3).getInputStream()) {
+            imageReader.setInput(stream);
 
             int numImages = imageReader.getNumImages(true);
             for (int i = 0; i < numImages; i++) {
                 ImageTypeSpecifier rawType = imageReader.getRawImageType(i);
-//            System.err.println("rawType: " + rawType);
                 assertNotNull(rawType);
 
                 Iterator<ImageTypeSpecifier> types = imageReader.getImageTypes(i);
@@ -317,7 +327,6 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
 
                 while (types.hasNext()) {
                     ImageTypeSpecifier type = types.next();
-//                System.err.println("type: " + type);
 
                     if (!found && (rawType == type || rawType.equals(type))) {
                         found = true;
@@ -327,12 +336,14 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
                 assertTrue("RAW image type not in type iterator", found);
             }
         }
+    }
 
     @Test
     public void testReadLayersExplicitType() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        imageReader.setInput(getTestData().get(3).getInputStream());
+        try (ImageInputStream stream = getTestData().get(3).getInputStream()) {
+            imageReader.setInput(stream);
 
             int numImages = imageReader.getNumImages(true);
             for (int i = 0; i < numImages; i++) {
@@ -365,12 +376,14 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
                 }
             }
         }
+    }
 
     @Test
     public void testReadLayersExplicitDestination() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        imageReader.setInput(getTestData().get(3).getInputStream());
+        try (ImageInputStream stream = getTestData().get(3).getInputStream()) {
+            imageReader.setInput(stream);
 
             int numImages = imageReader.getNumImages(true);
             for (int i = 0; i < numImages; i++) {
@@ -390,6 +403,55 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
                 }
             }
         }
+    }
+
+    @Test
+    public void testGrayAlphaLayers() throws IOException {
+        PSDImageReader imageReader = createReader();
+
+        // The expected colors for each layer
+        int[] colors = new int[] {
+                -1, // Don't care
+                0xff000000,
+                0xffffffff,
+                0xff737373,
+                0xff3c3c3c,
+                0xff656565,
+                0xffc9c9c9,
+                0xff979797,
+                0xff5a5a5a
+        };
+
+        try (ImageInputStream stream = ImageIO.createImageInputStream(getClassLoaderResource("/psd/test_grayscale_boxes.psd"))) {
+            imageReader.setInput(stream);
+
+            int numImages = imageReader.getNumImages(true);
+            assertEquals(colors.length, numImages);
+
+            // Skip reading the merged composite image
+            for (int i = 1; i < numImages; i++) {
+                Iterator<ImageTypeSpecifier> types = imageReader.getImageTypes(i);
+                int width = imageReader.getWidth(i);
+                int height = imageReader.getHeight(i);
+
+                while (types.hasNext()) {
+                    ImageTypeSpecifier type = types.next();
+
+                    ImageReadParam param = imageReader.getDefaultReadParam();
+                    BufferedImage destination = type.createBufferedImage(width, height);
+                    param.setDestination(destination);
+
+                    BufferedImage image = imageReader.read(i, param);
+
+                    assertSame(destination, image);
+
+                    // NOTE: Allow some slack, as Java 1.7 and 1.8 color management differs slightly
+                    int rgb = image.getRGB(0, 0);
+                    assertRGBEquals(String.format("#%04x != #%04x", colors[i], rgb), colors[i], rgb, 1);
+                }
+            }
+        }
+    }
 
     @Test
     public void testReadUnicodeLayerName() throws IOException {