Added missing CRW pom

CR2ImageReader: unslice result of JPEGLosslessDecoder

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -1,10 +1,16 @@
-**What is fixed** Add link to the issue this PR fixes. 
+**What is fixed**
 
-Example: Fixes #42. 
+Add link to the issue this PR fixes. 
 
-**Why is this change proposed** If this change does *not* fix an open issue, briefly describe the rationale for this PR.
+Fixes #42. 
 
-**What is changed** Briefly describe the changes proposed in this pull request: 
+**Why is this change proposed**
+
+If this change does *not* fix an open issue, briefly describe the rationale for this PR.
+
+**What is changed**
+
+Briefly describe the changes proposed in this pull request: 
 
 * Fixed rare exception happening in `x >= 42` case
 * Small optimization of `decompress()` method

.travis.yml

@@ -1,11 +1,9 @@
 dist: trusty
 language: java
 jdk:
-  - oraclejdk8  # LTS until Mar 2022
-  - oraclejdk11 # LTS until Sep 2023
-  - oraclejdk15 # out of support
-  - oraclejdk16 # out of support
-  - oraclejdk17 # LTS until Sep 2026
+  - oraclejdk8  # Legacy
+  - oraclejdk11 # LTS
+  - oraclejdk15 # Latest
 jobs:
   include:
     # Extra job, testing legacy CMM option

README.md

@@ -1,16 +1,19 @@
-[![Build Status](https://travis-ci.com/haraldk/TwelveMonkeys.svg?branch=master)](https://travis-ci.com/github/haraldk/TwelveMonkeys) 
+[![Build Status](https://travis-ci.org/haraldk/TwelveMonkeys.svg?branch=master)](https://travis-ci.org/haraldk/TwelveMonkeys) 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.twelvemonkeys.imageio/imageio/badge.svg?color=slateblue)](https://maven-badges.herokuapp.com/maven-central/com.twelvemonkeys.imageio/imageio)
 [![StackOverflow](https://img.shields.io/badge/stack_overflow-twelvemonkeys-orange.svg)](https://stackoverflow.com/questions/tagged/twelvemonkeys)
 [![Donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://paypal.me/haraldk76/100)
 
 ## About
 
-TwelveMonkeys ImageIO provides extended image file format support for the Java platform, through plugins for the `javax.imageio.*` package.
+TwelveMonkeys ImageIO is a collection of plugins and extensions for Java's ImageIO.
 
-The main goal of this project is to provide support for formats not covered by the JRE itself. 
-Support for these formats is important, to be able to read data found
+These plugins extend the number of image file formats supported in Java, using the `javax.imageio.*` package.
+The main purpose of this project is to provide support for formats not covered by the JRE itself.
+
+Support for formats is important, both to be able to read data found
 "in the wild", as well as to maintain access to data in legacy formats.
-As there is lots of legacy data out there, we see the need for open implementations of readers for popular formats.
+Because there is lots of legacy data out there, we see the need for open implementations of readers for popular formats.
+The goal is to create a set of efficient and robust ImageIO plug-ins, that can be distributed independently.
 
 ----
 

bom/pom.xml

@@ -58,6 +58,16 @@
                 <artifactId>imageio-bmp</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.twelvemonkeys.imageio</groupId>
+                <artifactId>imageio-cr2</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.twelvemonkeys.imageio</groupId>
+                <artifactId>imageio-dng</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.twelvemonkeys.imageio</groupId>
                 <artifactId>imageio-hdr</artifactId>
@@ -78,6 +88,11 @@
                 <artifactId>imageio-jpeg</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.twelvemonkeys.imageio</groupId>
+                <artifactId>imageio-nef</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.twelvemonkeys.imageio</groupId>
                 <artifactId>imageio-pcx</artifactId>
@@ -123,11 +138,6 @@
                 <artifactId>imageio-tiff</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.twelvemonkeys.imageio</groupId>
-                <artifactId>imageio-webp</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.twelvemonkeys.imageio</groupId>
                 <artifactId>imageio-xwd</artifactId>

common/common-image/src/main/java/com/twelvemonkeys/image/AffineTransformOp.java

@@ -34,13 +34,7 @@ import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ColorModel;
-import java.awt.image.ImagingOpException;
-import java.awt.image.Raster;
-import java.awt.image.RasterOp;
-import java.awt.image.WritableRaster;
+import java.awt.image.*;
 
 /**
  * This is a drop-in replacement for {@link java.awt.image.AffineTransformOp}.
@@ -76,7 +70,6 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
         delegate = new java.awt.image.AffineTransformOp(xform, interpolationType);
     }
 
-    @SuppressWarnings("ConstantConditions")
     @Override
     public BufferedImage filter(final BufferedImage src, BufferedImage dst) {
         try {
@@ -87,9 +80,10 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
                 dst = createCompatibleDestImage(src, src.getColorModel());
             }
 
-            Graphics2D g2d = dst.createGraphics();
+            Graphics2D g2d = null;
 
             try {
+                g2d = dst.createGraphics();
                 int interpolationType = delegate.getInterpolationType();
 
                 if (interpolationType > 0) {
@@ -115,7 +109,9 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
                 return dst;
             }
             finally {
-                g2d.dispose();
+                if (g2d != null) {
+                    g2d.dispose();
+                }
             }
         }
     }

common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java

@@ -45,8 +45,8 @@ import java.awt.image.BufferedImage;
  */
 public class BufferedImageIcon implements Icon {
     private final BufferedImage image;
-    private final int width;
-    private final int height;
+    private int width;
+    private int height;
     private final boolean fast;
 
     public BufferedImageIcon(BufferedImage pImage) {
@@ -81,10 +81,11 @@ public class BufferedImageIcon implements Icon {
         else {
             //System.out.println("Scaling using interpolation");
             Graphics2D g2 = (Graphics2D) g;
-            AffineTransform transform = AffineTransform.getTranslateInstance(x, y);
-            transform.scale(width / (double) image.getWidth(), height / (double) image.getHeight());
-            g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-            g2.drawImage(image, transform, null);
+            AffineTransform xform = AffineTransform.getTranslateInstance(x, y);
+            xform.scale(width / (double) image.getWidth(), height / (double) image.getHeight());
+            g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+                                RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+            g2.drawImage(image, xform, null);
         }
     }
 }

common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java

@@ -587,7 +587,6 @@ class IndexImage {
      * @deprecated Use {@link #getIndexColorModel(Image,int,int)} instead!
      *             This version will be removed in a later version of the API.
      */
-    @Deprecated
     public static IndexColorModel getIndexColorModel(Image pImage, int pNumberOfColors, boolean pFast) {
         return getIndexColorModel(pImage, pNumberOfColors, pFast ? COLOR_SELECTION_FAST : COLOR_SELECTION_QUALITY);
     }

common/common-image/src/test/java/com/twelvemonkeys/image/AffineTransformOpTest.java

@@ -30,26 +30,17 @@
 
 package com.twelvemonkeys.image;
 
-import static java.lang.Math.min;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import org.junit.Test;
 
+import javax.imageio.ImageTypeSpecifier;
 import java.awt.color.ColorSpace;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.DataBuffer;
-import java.awt.image.ImagingOpException;
-import java.awt.image.Raster;
-import java.awt.image.RasterOp;
+import java.awt.image.*;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.imageio.ImageTypeSpecifier;
-
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * AffineTransformOpTest.
@@ -110,7 +101,6 @@ public class AffineTransformOpTest {
 
     private final int width = 30;
     private final int height = 20;
-    private final double anchor = min(width, height) / 2.0;
 
     @Test
     public void testGetPoint2D() {
@@ -138,8 +128,8 @@ public class AffineTransformOpTest {
 
     @Test
     public void testFilterRotateBIStandard() {
-        BufferedImageOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
-        BufferedImageOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
+        BufferedImageOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
+        BufferedImageOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
 
         for (Integer type : TYPES) {
             BufferedImage image = new BufferedImage(width, height, type);
@@ -157,8 +147,8 @@ public class AffineTransformOpTest {
 
     @Test
     public void testFilterRotateBICustom() {
-        BufferedImageOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
-        BufferedImageOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
+        BufferedImageOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
+        BufferedImageOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
 
         for (ImageTypeSpecifier spec : SPECS) {
             BufferedImage image = spec.createBufferedImage(width, height);
@@ -207,8 +197,8 @@ public class AffineTransformOpTest {
 
     @Test
     public void testFilterRotateRasterStandard() {
-        RasterOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
-        RasterOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
+        RasterOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
+        RasterOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
 
         for (Integer type : TYPES) {
             Raster raster = new BufferedImage(width, height, type).getRaster();
@@ -231,6 +221,8 @@ public class AffineTransformOpTest {
                     fail("No result!");
                 }
                 else {
+                    System.err.println("AffineTransformOpTest.testFilterRotateRasterStandard");
+                    System.err.println("type: " + type);
                     continue;
                 }
             }
@@ -248,8 +240,8 @@ public class AffineTransformOpTest {
 
     @Test
     public void testFilterRotateRasterCustom() {
-        RasterOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
-        RasterOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
+        RasterOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
+        RasterOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
 
         for (ImageTypeSpecifier spec : SPECS) {
             Raster raster = spec.createBufferedImage(width, height).getRaster();
@@ -272,6 +264,8 @@ public class AffineTransformOpTest {
                     fail("No result!");
                 }
                 else {
+                    System.err.println("AffineTransformOpTest.testFilterRotateRasterCustom");
+                    System.err.println("spec: " + spec);
                     continue;
                 }
             }

common/common-io/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java

@@ -65,7 +65,6 @@ import java.io.FilenameFilter;
  * @see WildcardStringParser
  * @deprecated
  */
-@Deprecated
 public class FilenameMaskFilter implements FilenameFilter {
 
      // TODO: Rewrite to use regexp, or create new class

common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java

@@ -442,7 +442,6 @@ public class LittleEndianDataInputStream extends FilterInputStream implements Da
      * @see        java.io.BufferedReader#readLine()
      * @see        java.io.DataInputStream#readLine()
      */
-    @Deprecated
     public String readLine() throws IOException {
         DataInputStream ds = new DataInputStream(in);
         return ds.readLine();

common/common-lang/src/main/java/com/twelvemonkeys/lang/StringUtil.java

@@ -770,7 +770,6 @@ public final class StringUtil {
      */
 
     /*public*/
-    @Deprecated
     static String formatNumber(long pNum, int pLen) throws IllegalArgumentException {
         StringBuilder result = new StringBuilder();
 
@@ -1465,7 +1464,6 @@ public final class StringUtil {
      */
 
     /*public*/
-    @Deprecated
     static String removeSubstring(final String pSource, final char pBeginBoundaryChar, final char pEndBoundaryChar, final int pOffset) {
         StringBuilder filteredString = new StringBuilder();
         boolean insideDemarcatedArea = false;

common/common-lang/src/main/java/com/twelvemonkeys/util/Time.java

@@ -157,7 +157,6 @@ public class Time {
      * @see #parseTime(String)
      * @deprecated
      */
-    @Deprecated
     public String toString(String pFormatStr) {
         TimeFormat tf = new TimeFormat(pFormatStr);
 
@@ -175,7 +174,6 @@ public class Time {
      * @see #toString(String)
      * @deprecated
      */
-    @Deprecated
     public static Time parseTime(String pStr) {
         TimeFormat tf = TimeFormat.getInstance();
 

common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java

@@ -111,7 +111,6 @@ import java.io.PrintStream;
  * @author <a href="mailto:eirik.torske@iconmedialab.no">Eirik Torske</a>
  * @deprecated Will probably be removed in the near future
  */
-@Deprecated
 public class WildcardStringParser {
     // TODO: Get rid of this class
 

contrib/src/test/java/com/twelvemonkeys/contrib/tiff/TIFFUtilitiesTest.java

@@ -31,9 +31,8 @@
 package com.twelvemonkeys.contrib.tiff;
 
 import com.twelvemonkeys.contrib.tiff.TIFFUtilities.TIFFExtension;
-import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadataFormat;
+import com.twelvemonkeys.imageio.plugins.tiff.TIFFMedataFormat;
 import com.twelvemonkeys.io.FileUtil;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.w3c.dom.Node;
@@ -155,7 +154,7 @@ public class TIFFUtilitiesTest {
         reader.setInput(checkTest1);
         for (int i = 0; i < 3; i++) {
             Node metaData = reader.getImageMetadata(i)
-                    .getAsTree(TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME);
+                    .getAsTree(TIFFMedataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME);
             short orientation = ((Number) expression.evaluate(metaData, XPathConstants.NUMBER)).shortValue();
             Assert.assertEquals(orientation, TIFFExtension.ORIENTATION_RIGHTTOP);
         }
@@ -172,7 +171,7 @@ public class TIFFUtilitiesTest {
         reader.setInput(checkTest2);
         for (int i = 0; i < 3; i++) {
             Node metaData = reader.getImageMetadata(i)
-                    .getAsTree(TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME);
+                    .getAsTree(TIFFMedataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME);
             short orientation = ((Number) expression.evaluate(metaData, XPathConstants.NUMBER)).shortValue();
             Assert.assertEquals(orientation, i == 1
                                              ? TIFFExtension.ORIENTATION_BOTRIGHT

imageio/imageio-batik/pom.xml

@@ -68,6 +68,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>xmlgraphics-commons</artifactId>
+            <version>2.2</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-anim</artifactId>
@@ -91,7 +98,7 @@
             <!--
             There seems to be some weirdness in the
             Batik/FOP poms (Batik depends on FOP 0.20-5) that screws things up,
-            making everything end up depending on Batik 1.5, not the specified version
+            making everything end up depending on Batik 1.5, not 1.6
             -->
             <exclusions>
                 <exclusion>

imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java

@@ -30,8 +30,37 @@
 
 package com.twelvemonkeys.imageio.plugins.svg;
 
+import com.twelvemonkeys.image.ImageUtil;
+import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.lang.StringUtil;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.bridge.*;
+import org.apache.batik.css.parser.CSSLexicalUnit;
+import org.apache.batik.dom.util.DOMUtilities;
+import org.apache.batik.ext.awt.image.GraphicsUtil;
+import org.apache.batik.gvt.CanvasGraphicsNode;
+import org.apache.batik.gvt.GraphicsNode;
+import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory;
+import org.apache.batik.gvt.renderer.ImageRenderer;
+import org.apache.batik.gvt.renderer.ImageRendererFactory;
+import org.apache.batik.transcoder.*;
+import org.apache.batik.transcoder.image.ImageTranscoder;
+import org.apache.batik.util.ParsedURL;
+import org.apache.batik.util.SVGConstants;
+import org.apache.batik.xml.LexicalUnits;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.svg.SVGSVGElement;
+
+import javax.imageio.IIOException;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.spi.ImageReaderSpi;
 import java.awt.*;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Dimension2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -41,38 +70,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.imageio.IIOException;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.spi.ImageReaderSpi;
-
-import org.apache.batik.anim.dom.SVGDOMImplementation;
-import org.apache.batik.anim.dom.SVGOMDocument;
-import org.apache.batik.bridge.*;
-import org.apache.batik.dom.util.DOMUtilities;
-import org.apache.batik.ext.awt.image.GraphicsUtil;
-import org.apache.batik.gvt.CanvasGraphicsNode;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory;
-import org.apache.batik.gvt.renderer.ImageRenderer;
-import org.apache.batik.gvt.renderer.ImageRendererFactory;
-import org.apache.batik.transcoder.SVGAbstractTranscoder;
-import org.apache.batik.transcoder.TranscoderException;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.TranscodingHints;
-import org.apache.batik.transcoder.image.ImageTranscoder;
-import org.apache.batik.util.ParsedURL;
-import org.apache.batik.util.SVGConstants;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.svg.SVGSVGElement;
-
-import com.twelvemonkeys.image.ImageUtil;
-import com.twelvemonkeys.imageio.ImageReaderBase;
-import com.twelvemonkeys.imageio.util.IIOUtil;
-import com.twelvemonkeys.lang.StringUtil;
-
 /**
  * Image reader for SVG document fragments.
  *
@@ -135,7 +132,6 @@ public class SVGImageReader extends ImageReaderBase {
             // Set ImageReadParams as hints
             // Note: The cast to Map invokes a different method that preserves
             // unset defaults, DO NOT REMOVE!
-            //noinspection rawtypes
             rasterizer.setTranscodingHints((Map) paramsToHints(svgParam));
         }
 
@@ -264,7 +260,7 @@ public class SVGImageReader extends ImageReaderBase {
         }
     }
 
-    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) {
+    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
         return Collections.singleton(ImageTypeSpecifier.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator();
     }
 
@@ -293,7 +289,7 @@ public class SVGImageReader extends ImageReaderBase {
         }
 
         //  This is cheating... We don't fully transcode after all
-        protected void transcode(Document document, final String uri, final TranscoderOutput output) {
+        protected void transcode(Document document, final String uri, final TranscoderOutput output) throws TranscoderException {
             // Sets up root, curTxf & curAoi
             // ----
             if (document != null) {
@@ -588,7 +584,9 @@ public class SVGImageReader extends ImageReaderBase {
                 return dest;
             }
             catch (Exception ex) {
-                throw new TranscoderException(ex.getMessage(), ex);
+                TranscoderException exception = new TranscoderException(ex.getMessage());
+                exception.initCause(ex);
+                throw exception;
             }
             finally {
                 if (context != null) {

imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java

@@ -54,6 +54,8 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.*;
 
 /**
@@ -223,7 +225,7 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
             assertEquals(500, image.getHeight());
 
             // CSS and embedded resources all go!
-            verifyNoInteractions(listener);
+            verifyZeroInteractions(listener);
         }
         finally {
             reader.dispose();
@@ -264,7 +266,7 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
             assertEquals(500, image.getHeight());
 
             // No more warnings now that the base URI is set
-            verifyNoInteractions(listener);
+            verifyZeroInteractions(listener);
         }
         finally {
             reader.dispose();

imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java

@@ -30,22 +30,6 @@
 
 package com.twelvemonkeys.imageio.plugins.bmp;
 
-import com.twelvemonkeys.imageio.ImageReaderBase;
-import com.twelvemonkeys.imageio.stream.SubImageInputStream;
-import com.twelvemonkeys.imageio.util.IIOUtil;
-import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
-import com.twelvemonkeys.imageio.util.ProgressListenerBase;
-import com.twelvemonkeys.io.LittleEndianDataInputStream;
-import com.twelvemonkeys.io.enc.DecoderStream;
-import com.twelvemonkeys.xml.XMLSerializer;
-
-import javax.imageio.*;
-import javax.imageio.event.IIOReadUpdateListener;
-import javax.imageio.event.IIOReadWarningListener;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataFormatImpl;
-import javax.imageio.spi.ImageReaderSpi;
-import javax.imageio.stream.ImageInputStream;
 import java.awt.*;
 import java.awt.color.ColorSpace;
 import java.awt.image.*;
@@ -56,6 +40,27 @@ import java.nio.ByteOrder;
 import java.util.Collections;
 import java.util.Iterator;
 
+import javax.imageio.IIOException;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.event.IIOReadUpdateListener;
+import javax.imageio.event.IIOReadWarningListener;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.metadata.IIOMetadataFormatImpl;
+import javax.imageio.spi.ImageReaderSpi;
+import javax.imageio.stream.ImageInputStream;
+
+import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.stream.SubImageInputStream;
+import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
+import com.twelvemonkeys.imageio.util.ProgressListenerBase;
+import com.twelvemonkeys.io.LittleEndianDataInputStream;
+import com.twelvemonkeys.io.enc.DecoderStream;
+import com.twelvemonkeys.xml.XMLSerializer;
+
 /**
  * ImageReader for Microsoft Windows Bitmap (BMP) format.
  *
@@ -477,12 +482,8 @@ public final class BMPImageReader extends ImageReaderBase {
 
     private void readRowByte(final DataInput input, final int height, final Rectangle srcRegion, final int xSub, final int ySub,
                              final byte[] rowDataByte, final WritableRaster destChannel, final Raster srcChannel, final int y) throws IOException {
-        // Flip into position?
-        int srcY = !header.topDown ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
         // If subsampled or outside source region, skip entire row
-        if (srcY % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
             input.skipBytes(rowDataByte.length);
 
             return;
@@ -497,17 +498,19 @@ public final class BMPImageReader extends ImageReaderBase {
             }
         }
 
-        destChannel.setDataElements(0, dstY, srcChannel);
+        if (header.topDown) {
+            destChannel.setDataElements(0, y, srcChannel);
+        } else {
+            // Flip into position
+            int dstY = (height - 1 - y - srcRegion.y) / ySub;
+            destChannel.setDataElements(0, dstY, srcChannel);
+        }
     }
 
     private void readRowUShort(final DataInput input, final int height, final Rectangle srcRegion, final int xSub, final int ySub,
                                final short[] rowDataUShort, final WritableRaster destChannel, final Raster srcChannel, final int y) throws IOException {
-        // Flip into position?
-        int srcY = !header.topDown ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
         // If subsampled or outside source region, skip entire row
-        if (srcY % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
             input.skipBytes(rowDataUShort.length * 2 + (rowDataUShort.length % 2) * 2);
 
             return;
@@ -527,17 +530,19 @@ public final class BMPImageReader extends ImageReaderBase {
             }
         }
 
-        destChannel.setDataElements(0, dstY, srcChannel);
+        if (header.topDown) {
+            destChannel.setDataElements(0, y, srcChannel);
+        } else {
+            // Flip into position
+            int dstY = (height - 1 - y - srcRegion.y) / ySub;
+            destChannel.setDataElements(0, dstY, srcChannel);
+        }
     }
 
     private void readRowInt(final DataInput input, final int height, final Rectangle srcRegion, final int xSub, final int ySub,
                             final int[] rowDataInt, final WritableRaster destChannel, final Raster srcChannel, final int y) throws IOException {
-        // Flip into position?
-        int srcY = !header.topDown ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
         // If subsampled or outside source region, skip entire row
-        if (srcY % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
             input.skipBytes(rowDataInt.length * 4);
 
             return;
@@ -552,7 +557,13 @@ public final class BMPImageReader extends ImageReaderBase {
             }
         }
 
-        destChannel.setDataElements(0, dstY, srcChannel);
+        if (header.topDown) {
+            destChannel.setDataElements(0, y, srcChannel);
+        } else {
+            // Flip into position
+            int dstY = (height - 1 - y - srcRegion.y) / ySub;
+            destChannel.setDataElements(0, dstY, srcChannel);
+        }
     }
 
     // TODO: Candidate util method

imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java

@@ -32,8 +32,8 @@ package com.twelvemonkeys.imageio.plugins.bmp;
 
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeNoException;
-import static org.mockito.ArgumentMatchers.anyFloat;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
@@ -295,7 +295,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listener);
         ordered.verify(listener).imageStarted(reader, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
         ordered.verify(listener).imageComplete(reader);
     }
 
@@ -318,7 +318,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listener);
         ordered.verify(listener).imageStarted(reader, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
         ordered.verify(listener).imageComplete(reader);
     }
 

imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/AdobePathBuilder.java

@@ -39,7 +39,6 @@ import java.io.IOException;
  *
  * @deprecated Use {@link AdobePathReader} instead. This class will be removed in a future release.
  */
-@Deprecated
 public final class AdobePathBuilder {
 
     private final AdobePathReader delegate;

imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ColorSpaces.java

@@ -239,7 +239,6 @@ public final class ColorSpaces {
      * @return {@code true} if {@code profile} is equal to the default sRGB profile.
      * @throws IllegalArgumentException if {@code profile} is {@code null}
      *
-     * @see java.awt.color.ColorSpace#CS_sRGB
      * @see java.awt.color.ColorSpace#isCS_sRGB()
      */
     public static boolean isCS_sRGB(final ICC_Profile profile) {
@@ -248,21 +247,6 @@ public final class ColorSpaces {
         return profile.getColorSpaceType() == ColorSpace.TYPE_RGB && Arrays.equals(getProfileHeaderWithProfileId(profile), sRGB.header);
     }
 
-    /**
-     * Tests whether an ICC color profile is equal to the default GRAY profile.
-     *
-     * @param profile the ICC profile to test. May not be {@code null}.
-     * @return {@code true} if {@code profile} is equal to the default GRAY profile.
-     * @throws IllegalArgumentException if {@code profile} is {@code null}
-     *
-     * @see java.awt.color.ColorSpace#CS_GRAY
-     */
-    public static boolean isCS_GRAY(final ICC_Profile profile) {
-        Validate.notNull(profile, "profile");
-
-        return profile.getColorSpaceType() == ColorSpace.TYPE_GRAY && Arrays.equals(getProfileHeaderWithProfileId(profile), GRAY.header);
-    }
-
     /**
      * Tests whether an ICC color profile is known to cause problems for {@link java.awt.image.ColorConvertOp}.
      * <p>

imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/YCbCrConverter.java

@@ -45,82 +45,36 @@ public final class YCbCrConverter {
     private final static int CENTERJSAMPLE = 128;
     private final static int ONE_HALF = 1 << (SCALEBITS - 1);
 
-    private final static class JPEG {
-        private final static int[] Cr_R_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cb_B_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cr_G_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cb_G_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cr_R_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cb_B_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cr_G_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cb_G_LUT = new int[MAXJSAMPLE + 1];
 
-        /**
-         * Initializes tables for YCC->RGB color space conversion.
-         */
-        private static void buildYCCtoRGBtable() {
-            if (ColorSpaces.DEBUG) {
-                System.err.println("Building JPEG YCbCr conversion table");
-            }
-
-            for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-                // i is the actual input pixel value, in the range 0..MAXJSAMPLE
-                // The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE
-                // Cr=>R value is nearest int to 1.40200 * x
-                Cr_R_LUT[i] = (int) ((1.40200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
-                // Cb=>B value is nearest int to 1.77200 * x
-                Cb_B_LUT[i] = (int) ((1.77200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
-                // Cr=>G value is scaled-up -0.71414 * x
-                Cr_G_LUT[i] = -(int) (0.71414 * (1 << SCALEBITS) + 0.5) * x;
-                // Cb=>G value is scaled-up -0.34414 * x
-                // We also add in ONE_HALF so that need not do it in inner loop
-                Cb_G_LUT[i] = -(int) ((0.34414) * (1 << SCALEBITS) + 0.5) * x + ONE_HALF;
-            }
+    /**
+     * Initializes tables for YCC->RGB color space conversion.
+     */
+    private static void buildYCCtoRGBtable() {
+        if (ColorSpaces.DEBUG) {
+            System.err.println("Building YCC conversion table");
         }
 
-        static {
-            buildYCCtoRGBtable();
+        for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
+            // i is the actual input pixel value, in the range 0..MAXJSAMPLE
+            // The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE
+            // Cr=>R value is nearest int to 1.40200 * x
+            Cr_R_LUT[i] = (int) ((1.40200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
+            // Cb=>B value is nearest int to 1.77200 * x
+            Cb_B_LUT[i] = (int) ((1.77200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
+            // Cr=>G value is scaled-up -0.71414 * x
+            Cr_G_LUT[i] = -(int) (0.71414 * (1 << SCALEBITS) + 0.5) * x;
+            // Cb=>G value is scaled-up -0.34414 * x
+            // We also add in ONE_HALF so that need not do it in inner loop
+            Cb_G_LUT[i] = -(int) ((0.34414) * (1 << SCALEBITS) + 0.5) * x + ONE_HALF;
         }
     }
 
-    private final static class ITU_R_601 {
-        private final static int[] Cr_R_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cb_B_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cr_G_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cb_G_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Y_LUT = new int[MAXJSAMPLE + 1];
-
-        /**
-         * Initializes tables for YCC->RGB color space conversion.
-         */
-        private static void buildYCCtoRGBtable() {
-            if (ColorSpaces.DEBUG) {
-                System.err.println("Building ITU-R REC.601 YCbCr conversion table");
-            }
-
-            for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-                // i is the actual input pixel value, in the range 0..MAXJSAMPLE
-                // The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE
-
-                // Y'CbCr to RGB conversion, using values from BT.601 specification:
-                //   R = 1.16438 * (Y'-16)                      + 1.59603 * (Cr-128)
-                //   G = 1.16438 * (Y'-16) - 0.39176 * (Cb-128) - 0.81297 * (Cr-128)
-                //   B = 1.16438 * (Y'-16) + 2.01723 * (Cb-128)
-
-                // Cr=>R value is nearest int to 1.59603 * x
-                Cr_R_LUT[i] = ((int) (1.59603 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
-                // Cb=>B value is nearest int to 2.01723 * x
-                Cb_B_LUT[i] = ((int) (2.01723 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
-                // Cr=>G value is scaled-up -0.81297 * x
-                Cr_G_LUT[i] = -(int) (0.81297 * (1 << SCALEBITS) + 0.5) * x;
-                // Cb=>G value is scaled-up -0.39176 * x
-                // We also add in ONE_HALF so that need not do it in inner loop
-                Cb_G_LUT[i] = -(int) ((0.39176) * (1 << SCALEBITS) + 0.5) * x + ONE_HALF;
-
-                // Y`=>RGB
-                Y_LUT[i] = ((int) (1.16438 * (1 << SCALEBITS) + 0.5) * (i - 16) + ONE_HALF) >> SCALEBITS;
-            }
-        }
-
-        static {
-            buildYCCtoRGBtable();
-        }
+    static {
+        buildYCCtoRGBtable();
     }
 
     public static void convertYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final double[] coefficients, double[] referenceBW, final int offset) {
@@ -154,27 +108,17 @@ public final class YCbCrConverter {
         rgb[offset + 1] = clamp(green);
     }
 
-    public static void convertJPEGYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final int offset) {
-        int y  = yCbCr[offset    ] & 0xff;
-        int cb = yCbCr[offset + 1] & 0xff;
+    public static void convertYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final int offset) {
+        int y = yCbCr[offset] & 0xff;
         int cr = yCbCr[offset + 2] & 0xff;
+        int cb = yCbCr[offset + 1] & 0xff;
 
-        rgb[offset    ] = clamp(y + JPEG.Cr_R_LUT[cr]);
-        rgb[offset + 1] = clamp(y + (JPEG.Cb_G_LUT[cb] + JPEG.Cr_G_LUT[cr] >> SCALEBITS));
-        rgb[offset + 2] = clamp(y + JPEG.Cb_B_LUT[cb]);
+        rgb[offset] = clamp(y + Cr_R_LUT[cr]);
+        rgb[offset + 1] = clamp(y + (Cb_G_LUT[cb] + Cr_G_LUT[cr] >> SCALEBITS));
+        rgb[offset + 2] = clamp(y + Cb_B_LUT[cb]);
     }
 
-    public static void convertRec601YCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final int offset) {
-        int y =  yCbCr[offset    ] & 0xff;
-        int cb = yCbCr[offset + 1] & 0xff;
-        int cr = yCbCr[offset + 2] & 0xff;
-
-        rgb[offset    ] = clamp(ITU_R_601.Y_LUT[y] + ITU_R_601.Cr_R_LUT[cr]);
-        rgb[offset + 1] = clamp(ITU_R_601.Y_LUT[y] + (ITU_R_601.Cr_G_LUT[cr] + ITU_R_601.Cb_G_LUT[cb] >> SCALEBITS));
-        rgb[offset + 2] = clamp(ITU_R_601.Y_LUT[y] + ITU_R_601.Cb_B_LUT[cb]);
-    }
-
-    private static byte clamp(final int val) {
+    private static byte clamp(int val) {
         return (byte) Math.max(0, Math.min(255, val));
     }
 }

imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ColorSpacesTest.java

@@ -184,24 +184,6 @@ public class ColorSpacesTest {
         ColorSpaces.isCS_sRGB(null);
     }
 
-    @Test
-    public void testIsCS_GRAYTrue() {
-        assertTrue(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_GRAY)));
-    }
-
-    @Test
-    public void testIsCS_GRAYFalse() {
-        assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_sRGB)));
-        assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB)));
-        assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ)));
-        assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_PYCC)));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testIsCS_GRAYNull() {
-        ColorSpaces.isCS_GRAY(null);
-    }
-
     @Test
     public void testEqualHeadersDifferentProfile() throws IOException {
         // These profiles are extracted from various JPEGs, and have the exact same profile header...

imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/KCMSSanitizerStrategyTest.java

@@ -39,6 +39,8 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 public class KCMSSanitizerStrategyTest {

imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java

@@ -45,8 +45,9 @@ import javax.imageio.spi.IIORegistry;
 import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.awt.image.SampleModel;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
@@ -56,7 +57,6 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import static java.lang.Math.min;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
@@ -1151,7 +1151,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listener);
         ordered.verify(listener).imageStarted(reader, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
         ordered.verify(listener).imageComplete(reader);
         reader.dispose();
     }
@@ -1184,9 +1184,9 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         ordered.verify(listenerToo).imageStarted(reader, 0);
         ordered.verify(listenerThree).imageStarted(reader, 0);
 
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyFloat());
-        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(reader), anyInt());
 
         ordered.verify(listener).imageComplete(reader);
         ordered.verify(listenerToo).imageComplete(reader);
@@ -1226,7 +1226,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         }
 
         // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
         reader.dispose();
     }
 
@@ -1253,11 +1253,11 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         }
 
         // Should not have called any methods on listener1...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
 
         InOrder ordered = inOrder(listenerToo);
         ordered.verify(listenerToo).imageStarted(reader, 0);
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyInt());
         ordered.verify(listenerToo).imageComplete(reader);
         reader.dispose();
     }
@@ -1281,7 +1281,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         }
 
         // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
         reader.dispose();
     }
 
@@ -1307,8 +1307,8 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         }
 
         // Should not have called any methods...
-        verifyNoInteractions(listener);
-        verifyNoInteractions(listenerToo);
+        verifyZeroInteractions(listener);
+        verifyZeroInteractions(listenerToo);
         reader.dispose();
     }
 
@@ -1333,7 +1333,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
             }
         };
         doAnswer(abort).when(abortingListener).imageStarted(any(ImageReader.class), anyInt());
-        doAnswer(abort).when(abortingListener).imageProgress(any(ImageReader.class), anyFloat());
+        doAnswer(abort).when(abortingListener).imageProgress(any(ImageReader.class), anyInt());
 
         reader.addIIOReadProgressListener(abortingListener);
 
@@ -1738,43 +1738,6 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         reader.dispose();
     }
 
-    protected List<TestData> getTestDataForAffineTransformOpCompatibility() {
-        // Allow subclasses to filter out test data that can't be converted to a compatible image without data loss
-        return getTestData();
-    }
-
-    @Test
-    public void testAffineTransformOpCompatibility() throws IOException {
-        // Test that the output of normal images are compatible with AffineTransformOp. Is unlikely to work on all test data
-        ImageReader reader = createReader();
-
-        for (TestData testData : getTestDataForAffineTransformOpCompatibility()) {
-            try (ImageInputStream input = testData.getInputStream()) {
-                reader.setInput(input);
-
-                ImageReadParam param = reader.getDefaultReadParam();
-                param.setSourceRegion(new Rectangle(min(reader.getWidth(0), 64), min(reader.getHeight(0), 64)));
-
-                BufferedImage originalImage = reader.read(0, param);
-
-                AffineTransform transform = AffineTransform.getTranslateInstance(10, 10);
-                AffineTransformOp op = new AffineTransformOp(transform, AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
-
-                try {
-                    BufferedImage resultImage = op.filter(originalImage, null); // The exception happens here
-                    assertNotNull(resultImage);
-                }
-                catch (ImagingOpException e) {
-                    fail(e.getMessage() + ".\n\t"
-                            + originalImage + "\n\t"
-                            + testData);
-                }
-            }
-        }
-
-        reader.dispose();
-    }
-
     @Ignore("TODO: Implement")
     @Test
     public void testSetDestinationBands() {

imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTest.java

@@ -52,6 +52,7 @@ import java.net.URL;
 import java.util.List;
 
 import static org.junit.Assert.*;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.*;
 
 /**
@@ -78,7 +79,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
     protected abstract ImageWriterSpi createProvider();
 
     protected final T createWriter() throws IOException {
-        return writerClass.cast(provider.createWriterInstance());
+        return writerClass.cast(provider.createWriterInstance(null));
     }
 
     protected abstract List<? extends RenderedImage> getTestData();
@@ -103,7 +104,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
 
         return image;
     }
-
+    
     protected final RenderedImage getTestData(final int index) {
         return getTestData().get(index);
     }
@@ -218,7 +219,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listener);
         ordered.verify(listener).imageStarted(writer, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyInt());
         ordered.verify(listener).imageComplete(writer);
     }
 
@@ -250,9 +251,9 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         ordered.verify(listenerToo).imageStarted(writer, 0);
         ordered.verify(listenerThree).imageStarted(writer, 0);
 
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyFloat());
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyFloat());
-        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(writer), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyInt());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyInt());
+        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(writer), anyInt());
 
         ordered.verify(listener).imageComplete(writer);
         ordered.verify(listenerToo).imageComplete(writer);
@@ -289,7 +290,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         }
 
         // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
     }
 
     @Test
@@ -314,12 +315,12 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         }
 
         // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
 
         // At least imageStarted and imageComplete, plus any number of imageProgress
         InOrder ordered = inOrder(listenerToo);
         ordered.verify(listenerToo).imageStarted(writer, 0);
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyFloat());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyInt());
         ordered.verify(listenerToo).imageComplete(writer);
 
     }
@@ -344,7 +345,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         }
 
         // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
     }
 
     @Test
@@ -370,7 +371,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         }
 
         // Should not have called any methods...
-        verifyNoInteractions(listener);
-        verifyNoInteractions(listenerToo);
+        verifyZeroInteractions(listener);
+        verifyZeroInteractions(listenerToo);
     }
 }

imageio/imageio-cr2/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2014, Harald Kuhr
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without
+  ~ modification, are permitted provided that the following conditions are met:
+  ~     * Redistributions of source code must retain the above copyright
+  ~       notice, this list of conditions and the following disclaimer.
+  ~     * Redistributions in binary form must reproduce the above copyright
+  ~       notice, this list of conditions and the following disclaimer in the
+  ~       documentation and/or other materials provided with the distribution.
+  ~     * Neither the name "TwelveMonkeys" nor the
+  ~       names of its contributors may be used to endorse or promote products
+  ~       derived from this software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  ~ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  ~ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  ~ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  ~ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  ~ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>imageio</artifactId>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <version>3.8.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>imageio-cr2</artifactId>
+    <name>TwelveMonkeys :: ImageIO :: CR2 plugin</name>
+    <description>ImageIO plugin for Canon RAW (CR2) format.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-metadata</artifactId>
+        </dependency>
+        <dependency>
+            <version>${project.version}</version>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-jpeg</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReader.java

@@ -0,0 +1,492 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.cr2;
+
+import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.metadata.CompoundDirectory;
+import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegment;
+import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegmentUtil;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
+import com.twelvemonkeys.imageio.plugins.jpeg.Slice;
+import com.twelvemonkeys.imageio.plugins.jpeg.SliceContext;
+import com.twelvemonkeys.imageio.stream.SubImageInputStream;
+
+import javax.imageio.IIOException;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.spi.ImageReaderSpi;
+import javax.imageio.stream.ImageInputStream;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+//import com.twelvemonkeys.imageio.plugins.jpeg.LosslessJPEGDecoder;
+
+/**
+ * Canon CR2 RAW ImageReader.
+ * <p/>
+ * Acknowledgement:
+ * This ImageReader is based on the excellent work of Laurent Clevy, and would probably not exist without it.
+ *
+ * @see <a href="http://lclevy.free.fr/dng/">Understanding What is stored in a Canon RAW .CR2 file, How and Why</a>
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CR2ImageReader.java,v 1.0 07.04.14 21:31 haraldk Exp$
+ */
+public final class CR2ImageReader extends ImageReaderBase {
+    // See http://lclevy.free.fr/dng/
+    // TODO: Avoid duped code from TIFFImageReader
+    // TODO: Probably a good idea to move some of the getAsShort/Int/Long/Array to TIFF/EXIF metadata module
+    // TODO: Automatic EXIF rotation, if we find a good way to do that for JPEG/EXIF/TIFF and keeping the metadata sane...
+
+    final static boolean DEBUG =  true; //"true".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.imageio.plugins.dng.debug"));
+
+    // Thumbnail is in IFD1 (2nd entry)
+    private final static int THUMBNAIL_IFD = 1;
+
+    private CompoundDirectory IFDs;
+    private Directory currentIFD;
+
+    CR2ImageReader(final ImageReaderSpi provider) {
+        super(provider);
+    }
+
+    @Override
+    protected void resetMembers() {
+        IFDs = null;
+        currentIFD = null;
+    }
+
+    private void readMetadata() throws IOException {
+        if (imageInput == null) {
+            throw new IllegalStateException("input not set");
+        }
+
+        if (IFDs == null) {
+            // We'll validate the TIFF structure later, for now just see if we have 'CR'0x0200 at the right place
+
+            imageInput.skipBytes(8); // TIFF byte order mark + magic + IFD0 offset
+
+            if (imageInput.readByte() != 'C' || imageInput.readByte() != 'R') {
+                throw new IIOException("Not a valid CR2 structure: Missing CR magic ('CR')");
+            }
+
+            int version = imageInput.readUnsignedByte();
+            int revision = imageInput.readUnsignedByte();
+
+            // TODO: Choke on anything but 2.0? All sample data from 400D until 5D mk III has 2.0 version...
+
+            imageInput.seek(0);
+
+            IFDs = (CompoundDirectory) new TIFFReader().read(imageInput); // NOTE: Sets byte order as a side effect
+
+            if (DEBUG) {
+                System.err.println("Byte order: " + imageInput.getByteOrder());
+                System.err.println("Version: " + version + "." + revision);
+                System.err.println("Number of IFDs: " + IFDs.directoryCount());
+
+                for (int i = 0; i < IFDs.directoryCount(); i++) {
+                    System.err.printf("IFD %d: %s\n", i, IFDs.getDirectory(i));
+                }
+            }
+        }
+    }
+
+    private void readIFD(final int ifdIndex) throws IOException {
+        readMetadata();
+
+        if (ifdIndex < 0) {
+            throw new IndexOutOfBoundsException("index < minIndex");
+        }
+        else if (ifdIndex >= IFDs.directoryCount()) {
+            throw new IndexOutOfBoundsException("index >= numImages (" + ifdIndex + " >= " + IFDs.directoryCount() + ")");
+        }
+
+        currentIFD = IFDs.getDirectory(ifdIndex);
+    }
+
+    @Override
+    public int getNumImages(final boolean allowSearch) throws IOException {
+        readMetadata();
+
+        // This validation is maybe a little too restrictive, but ok for now
+        if (IFDs.directoryCount() != 4) {
+            throw new IIOException("Unexpected number of IFDs in CR2: " + IFDs.directoryCount());
+        }
+
+        return IFDs.directoryCount() - 1;
+    }
+
+    @Override
+    public int getNumThumbnails(int imageIndex) throws IOException {
+        readMetadata();
+        checkBounds(imageIndex);
+
+        return imageIndex == 0 ? 1 : 0;
+    }
+
+    @Override
+    public boolean readerSupportsThumbnails() {
+        return true;
+    }
+
+    @Override
+    public int getThumbnailWidth(int imageIndex, int thumbnailIndex) throws IOException {
+        readMetadata();
+        checkBounds(imageIndex);
+
+        // TODO: Need to get from JPEGImageReader (no ImageWidth tag), this is an ok (but lame) implementation for now
+        return super.getThumbnailWidth(imageIndex, thumbnailIndex);
+    }
+
+    @Override
+    public int getThumbnailHeight(int imageIndex, int thumbnailIndex) throws IOException {
+        readMetadata();
+        checkBounds(imageIndex);
+
+        // TODO: Need to get from JPEGImageReader (no ImageHeight tag), this is an ok (but lame) implementation for now
+        return super.getThumbnailHeight(imageIndex, thumbnailIndex);
+    }
+
+    @Override
+    public BufferedImage readThumbnail(int imageIndex, int thumbnailIndex) throws IOException {
+        readIFD(THUMBNAIL_IFD);
+
+        if (imageIndex != 0) {
+            throw new IndexOutOfBoundsException("No thumbnail for imageIndex: " + imageIndex);
+        }
+        if (thumbnailIndex != 0) {
+            throw new IndexOutOfBoundsException("thumbnailIndex out of bounds: " + thumbnailIndex);
+        }
+
+        // This IFD (IFD1) lacks Compression 6 (old JPEG), but has the relevant tags for a JPEG/EXIF thumbnail
+        int jpegOffset = getValueAsInt(TIFF.TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat");
+        int jpegLength = getValueAsInt(TIFF.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, "JPEGInterchangeFormatLength");
+
+        imageInput.seek(jpegOffset);
+
+        // TODO: Consider using cached JPEGImageReader directly
+        return ImageIO.read(new SubImageInputStream(imageInput, jpegLength));
+    }
+
+    private long[] getValueAsLongArray(final int tag, final String tagName, boolean required) throws IIOException {
+        Entry entry = currentIFD.getEntryById(tag);
+        if (entry == null) {
+            if (required) {
+                throw new IIOException("Missing TIFF tag " + tagName);
+            }
+
+            return null;
+        }
+
+        long[] value;
+
+        if (entry.valueCount() == 1) {
+            // For single entries, this will be a boxed type
+            value = new long[] {((Number) entry.getValue()).longValue()};
+        }
+        else if (entry.getValue() instanceof short[]) {
+            short[] shorts = (short[]) entry.getValue();
+            value = new long[shorts.length];
+
+            for (int i = 0, length = value.length; i < length; i++) {
+                value[i] = shorts[i];
+            }
+        }
+        else if (entry.getValue() instanceof int[]) {
+            int[] ints = (int[]) entry.getValue();
+            value = new long[ints.length];
+
+            for (int i = 0, length = value.length; i < length; i++) {
+                value[i] = ints[i];
+            }
+        }
+        else if (entry.getValue() instanceof long[]) {
+            value = (long[]) entry.getValue();
+        }
+        else {
+            throw new IIOException(String.format("Unsupported %s type: %s (%s)", tagName, entry.getTypeName(), entry.getValue().getClass()));
+        }
+
+        return value;
+    }
+
+    private Number getValueAsNumberWithDefault(final int tag, final String tagName, final Number defaultValue) throws IIOException {
+        Entry entry = currentIFD.getEntryById(tag);
+
+        if (entry == null) {
+            if (defaultValue != null)  {
+                return defaultValue;
+            }
+
+            throw new IIOException("Missing TIFF tag: " + (tagName != null ? tagName : tag));
+        }
+
+        return (Number) entry.getValue();
+    }
+
+    private long getValueAsLongWithDefault(final int tag, final String tagName, final Long defaultValue) throws IIOException {
+        return getValueAsNumberWithDefault(tag, tagName, defaultValue).longValue();
+    }
+
+    private long getValueAsLongWithDefault(final int tag, final Long defaultValue) throws IIOException {
+        return getValueAsLongWithDefault(tag, null, defaultValue);
+    }
+
+    private int getValueAsIntWithDefault(final int tag, final String tagName, final Integer defaultValue) throws IIOException {
+        return getValueAsNumberWithDefault(tag, tagName, defaultValue).intValue();
+    }
+
+    private int getValueAsIntWithDefault(final int tag, Integer defaultValue) throws IIOException {
+        return getValueAsIntWithDefault(tag, null, defaultValue);
+    }
+
+    private int getValueAsInt(final int tag, String tagName) throws IIOException {
+        return getValueAsIntWithDefault(tag, tagName, null);
+    }
+
+    private int imageIndexToIFDNumber(int imageIndex) {
+        return imageIndex >= THUMBNAIL_IFD ? imageIndex + 1 : imageIndex;
+    }
+
+    @Override
+    public int getWidth(int imageIndex) throws IOException {
+        readIFD(imageIndexToIFDNumber(imageIndex));
+
+        return getValueAsInt(TIFF.TAG_IMAGE_WIDTH, "ImageWidth");
+    }
+
+    @Override
+    public int getHeight(int imageIndex) throws IOException {
+        readIFD(imageIndexToIFDNumber(imageIndex));
+
+        return getValueAsInt(TIFF.TAG_IMAGE_HEIGHT, "ImageHeight");
+    }
+
+    @Override
+    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
+        readIFD(imageIndexToIFDNumber(imageIndex));
+
+        // TODO: For IFD0, get from JPEGImageReader delagate
+
+//        return Arrays.asList(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR)).iterator();
+        Entry bitsPerSample = currentIFD.getEntryById(TIFF.TAG_BITS_PER_SAMPLE);
+        if (bitsPerSample == null) {
+            // TODO: FixME!
+            return Arrays.asList(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR)).iterator();
+        }
+
+        // For IFD1, create linear RGB, but we don't really know...
+        int bitDepth = ((int[]) bitsPerSample.getValue())[0]; // Assume all equal!
+        if (bitDepth == 8) {
+            return Arrays.asList(ImageTypeSpecifier.createInterleaved(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), new int [] {0, 1, 2}, DataBuffer.TYPE_BYTE, false, false)).iterator();
+        }
+        else if (bitDepth == 16) {
+            return Arrays.asList(ImageTypeSpecifier.createInterleaved(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), new int [] {0, 1, 2}, DataBuffer.TYPE_USHORT, false, false)).iterator();
+        }
+
+        throw new IIOException("Unsupported bit depth: " + bitDepth);
+    }
+
+    @Override
+    public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException {
+        readIFD(imageIndexToIFDNumber(imageIndex));
+
+        if (imageIndex == 0) {
+            // This one says Compression 6 (old JPEG) and contains normal JPEG data at StripOffsets (but has no JPEGInterchangeFormat tag)
+            int compression = getValueAsInt(TIFF.TAG_COMPRESSION, "Compression");
+            if (compression != 6) {
+                throw new IIOException("Unknown TIFF compression for CR2 IFD0: " + compression);
+            }
+
+            int stripOffsets = getValueAsInt(TIFF.TAG_STRIP_OFFSETS, "StripOffsets");
+            int stripByteCounts = getValueAsInt(TIFF.TAG_STRIP_BYTE_COUNTS, "StripByteCounts");
+            imageInput.seek(stripOffsets);
+
+            List<JPEGSegment> segments = JPEGSegmentUtil.readSegments(new SubImageInputStream(imageInput, stripByteCounts), JPEGSegmentUtil.ALL_SEGMENTS);
+            System.err.println("segments: " + segments);
+
+            imageInput.seek(stripOffsets);
+            BufferedImage image = ImageIO.read(new SubImageInputStream(imageInput, stripByteCounts));
+            System.err.println("image: " + image);
+            return image;
+        }
+
+        if (imageIndex == 1) {
+            // This one is semi-ok, for older cameras is says Compression 6 (old JPEG), for 7D it says Compression 1 (None)
+            // We'll just ignore the compression and assume it's 1 (None).
+            // TODO: Probably a good idea to verify that we have no other compression than 6/1
+            // TODO: Consider just masking out this image, as it's not of much use...
+
+            int width = getWidth(imageIndex);
+            int height = getHeight(imageIndex);
+
+            BufferedImage destination = getDestination(param, getImageTypes(imageIndex), width, height);
+            WritableRaster raster;
+
+            int dataType = destination.getSampleModel().getDataType();
+            if (dataType == DataBuffer.TYPE_BYTE) {
+                // Emulate raw type (as dest, but RGB instead of BGR)
+                raster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, 1, width * 3, 3, new int[] {0, 1, 2}, null);
+            }
+            else if (dataType == DataBuffer.TYPE_USHORT) {
+                // Emulate raw type (as dest, but RGB instead of BGR)
+                raster = Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT, width, 1, width * 3, 3, new int[] {0, 1, 2}, null);
+            }
+            else {
+                throw new AssertionError();
+            }
+
+            DataBuffer dataBuffer = raster.getDataBuffer();
+
+            SampleModel destSampleModel = destination.getSampleModel();
+            DataBuffer destBuffer = destination.getRaster().getDataBuffer();
+            SampleModel srcSampleModel = raster.getSampleModel();
+
+            if (destBuffer.getSize() != getValueAsInt(TIFF.TAG_STRIP_BYTE_COUNTS, "StripByteCounts")) {
+                System.err.println("dataBuffer: " + dataBuffer.getSize());
+                System.err.println("StripByteCounts: " + getValueAsInt(TIFF.TAG_STRIP_BYTE_COUNTS, "StripByteCounts"));
+            }
+
+            int stripOffsets = getValueAsInt(TIFF.TAG_STRIP_OFFSETS, "StripOffsets");
+            imageInput.seek(stripOffsets);
+
+            Object data = null;
+            for (int y = 0; y < height; y++) {
+                if (dataType == DataBuffer.TYPE_BYTE) {
+                    imageInput.readFully(((DataBufferByte) dataBuffer).getData());
+                }
+                else {
+                    imageInput.readFully(((DataBufferUShort) dataBuffer).getData(), 0, dataBuffer.getSize());
+                }
+
+                data = srcSampleModel.getDataElements(0, 0, width, 1, data, dataBuffer);
+                destSampleModel.setDataElements(0, y, width, 1, data, destBuffer);
+            }
+
+            // TODO: This seems to work as crop values, if so correct w/h from getImageWidth/Height??
+            Entry unknown = currentIFD.getEntryById(50908);
+            if (unknown != null) {
+                Graphics2D g = destination.createGraphics();
+                try {
+                    long[] values = (long[]) unknown.getValue();
+
+                    g.setPaint(new Color(63, 223, 88, 128));
+//                    g.drawRect((int) values[2], (int) values[3], (int) values[0], (int) values[1]);
+//                    g.fillRect((int) values[2], (int) values[3], (int) values[0], (int) values[1]);
+                    g.fillRect(0, 0, width, (int) values[3]);
+                    g.fillRect(0, (int) values[3], (int) values[2], (int) (values[1] + values[3]));
+                    g.fillRect((int) (values[2] + values[0]), (int) values[3], (int) values[2], (int) (values[1] + values[3]));
+                    g.fillRect(0, (int) (values[3] + values[1]), width, height - (int) (values[3] + values[1]));
+                }
+                finally {
+                    g.dispose();
+                }
+            }
+
+            return destination;
+        }
+
+        if (imageIndex == 2) {
+            // TODO: This is the real RAW data. It's supposed to be lossless JPEG encoded, single channel,
+            // and has to be interpolated to become full 3 channel data from the Bayer CFA array,
+            // then further processed with white balance correction, black subtraction and color scaling.
+            // At least. ;-)
+
+            // We should probably just mask this image out, until we can read it
+
+            int stripOffsets = getValueAsInt(TIFF.TAG_STRIP_OFFSETS, "StripOffsets");
+            int stripByteCounts = getValueAsInt(TIFF.TAG_STRIP_BYTE_COUNTS, "StripByteCounts");
+            long[] slices = getValueAsLongArray(50752, "Slices", true);
+
+            try {
+                final Slice slice = Slice.createSlice(slices);
+                SliceContext.set(slice);
+
+                // TODO: Get correct dimensions (sensor size?)
+                int width = getWidth(0);
+                int height = getHeight(0);
+
+                imageInput.seek(stripOffsets);
+                return ImageIO.read(new SubImageInputStream(imageInput, stripByteCounts));
+            } finally {
+                SliceContext.remove();
+            }
+
+//            byte[] data = new LosslessJPEGDecoder().decompress(new SubImageInputStream(imageInput, stripByteCounts), null);
+//
+//            // TODO: We really have 2 bytes/sample
+//            short[] data2 = new short[data.length / 2];
+//            ByteBuffer wrap = ByteBuffer.wrap(data);
+//            wrap.asShortBuffer().get(data2);
+//
+//            System.err.println("data.length: " + data2.length);
+//            System.err.println("width x height: " + width * height);
+//
+//            DataBuffer dataBuffer = new DataBufferUShort(data2, data2.length);
+//            WritableRaster raster = Raster.createInterleavedRaster(dataBuffer, width, height, width, 1, new int[] {0}, null);
+//            ColorModel cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_GRAY), false, false, Transparency.OPAQUE, raster.getTransferType());
+//            BufferedImage image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
+//
+//            System.err.println("image: " + image);
+//
+//            return image;
+        }
+
+        return null;
+    }
+
+    public static void main(String[] args) throws IOException {
+        CR2ImageReader reader = new CR2ImageReader(new CR2ImageReaderSpi());
+
+        for (String arg : args) {
+            ImageInputStream stream = ImageIO.createImageInputStream(new File(arg));
+            reader.setInput(stream);
+
+            int numImages = reader.getNumImages(true);
+            for (int i = 0; i < numImages; i++) {
+                int numThumbnails = reader.getNumThumbnails(i);
+                for (int n = 0; n < numThumbnails; n++) {
+                    showIt(reader.readThumbnail(i, n), arg + " image " + i + " thumbnail " + n);
+                }
+
+                showIt(reader.read(i), arg + " image " + i);
+            }
+        }
+    }
+}

imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderSpi.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.cr2;
+
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
+
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.Locale;
+
+/**
+ * CR2ImageReaderSpi
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CR2ImageReaderSpi.java,v 1.0 07.04.14 21:26 haraldk Exp$
+ */
+public final class CR2ImageReaderSpi extends ImageReaderSpiBase {
+    public CR2ImageReaderSpi() {
+        super(new CR2ProviderInfo());
+    }
+
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        if (!(pSource instanceof ImageInputStream)) {
+            return false;
+        }
+
+        ImageInputStream stream = (ImageInputStream) pSource;
+
+        stream.mark();
+        try {
+            byte[] bom = new byte[2];
+            stream.readFully(bom);
+
+            ByteOrder originalOrder = stream.getByteOrder();
+
+            try {
+                if (bom[0] == 'I' && bom[1] == 'I') {
+                    stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+                }
+                else if (bom[0] == 'M' && bom[1] == 'M') {
+                    stream.setByteOrder(ByteOrder.BIG_ENDIAN);
+                }
+                else  {
+                    return false;
+                }
+
+                int tiffMagic = stream.readUnsignedShort();
+                if (tiffMagic != TIFF.TIFF_MAGIC) {
+                    return false;
+                }
+
+                stream.skipBytes(4); // TIFF IFD0 offset
+
+                if (stream.readByte() != 'C' || stream.readByte() != 'R') {
+                    return false;
+                }
+
+                // Version 2.0
+                return stream.readUnsignedByte() == 2 && stream.readUnsignedByte() == 0;
+            }
+            finally {
+                stream.setByteOrder(originalOrder);
+            }
+        }
+        finally {
+            stream.reset();
+        }
+    }
+
+    @Override
+    public ImageReader createReaderInstance(Object extension) throws IOException {
+        return new CR2ImageReader(this);
+    }
+
+    @Override
+    public String getDescription(Locale locale) {
+        return "Canon RAW (CR2) format Reader";
+    }
+
+}

imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ProviderInfo.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018, Oleg Ermolaev
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.cr2;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * @author Oleg Ermolaev Date: 04.05.2018 1:50
+ */
+class CR2ProviderInfo extends ReaderWriterProviderInfo {
+    protected CR2ProviderInfo() {
+        super(
+                CR2ProviderInfo.class,
+                new String[]{"cr2", "CR2"},
+                new String[]{"cr2"},
+                new String[]{"image/x-canon-raw",               // TODO: Look up
+                },
+                "com.twelvemonkeys.imageio.plugins.cr2.CR2ImageReader",
+                new String[]{"com.twelvemonkeys.imageio.plugins.cr2.CR2ImageReaderSpi"},
+                null,
+                null,
+                true,
+                null,
+                null,
+                null,
+                null,
+                true,
+                null,
+                null,
+                null,
+                null
+        );
+    }
+}

imageio/imageio-cr2/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi

@@ -0,0 +1 @@
+com.twelvemonkeys.imageio.plugins.cr2.CR2ImageReaderSpi

imageio/imageio-cr2/src/test/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderTest.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.cr2;
+
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import javax.imageio.ImageReader;
+import javax.imageio.spi.ImageReaderSpi;
+import java.awt.*;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * CR2ImageReaderTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CR2ImageReaderTest.java,v 1.0 07.04.14 21:52 haraldk Exp$
+ */
+@Ignore
+public class CR2ImageReaderTest extends ImageReaderAbstractTest<CR2ImageReader> {
+    @Override
+    protected List<TestData> getTestData() {
+        return Arrays.asList(
+                new TestData(
+                        getClassLoaderResource("/cr2/IMG_3483.CR2"), // Canon EOS 400D
+                        new Dimension(3888, 2592) // This is what the TIFF structure says...
+                        /* from http://lclevy.free.fr/dng/:
+                        new Dimension(3888 / 4, 2592 / 4), // The image is supposed to be 1/4 of the size in the TIFF tags...
+                        new Dimension(-1, -1), // "small version", no size information, only JPEG data (EXIF thumbnail)
+                        new Dimension(384, 256), // according to http://lclevy.free.fr/dng/ this is not compressed, but TIFF structure says JPEG... Perhaps JPEG lossless?
+                        new Dimension(3888, 2592) // Full size image, no size information
+                        */
+                )
+                // TODO: EOS 7D sample
+        );
+    }
+
+    @Override
+    protected ImageReaderSpi createProvider() {
+        return new CR2ImageReaderSpi();
+    }
+
+    @Override
+    protected List<String> getFormatNames() {
+        return Arrays.asList("cr2");
+    }
+
+    @Override
+    protected List<String> getSuffixes() {
+        return Arrays.asList("cr2");
+    }
+
+    @Override
+    protected List<String> getMIMETypes() {
+        return Arrays.asList("image/x-canon-raw");
+    }
+
+    @Test
+    @Ignore("Known issue: Subsampled reading not supported")
+    @Override
+    public void testReadWithSubsampleParamPixels() throws IOException {
+        super.testReadWithSubsampleParamPixels();
+    }
+
+    @Test
+    @Ignore("Known issue: Source region reading not supported")
+    @Override
+    public void testReadWithSourceRegionParamEqualImage() throws IOException {
+        super.testReadWithSourceRegionParamEqualImage();
+    }
+}

imageio/imageio-cr2/src/test/resources/cr2/readme.txt

@@ -0,0 +1,7 @@
+Contents:
+IMG_3483.CR2 - Rusty chain at Vækerø harbour, Oslo, Norway, Canon 400D, by me
+IMG_4841.CR2 - Chimneys at Casa Mila, Barcelona, Spain, Canon 400D, by me
+IMG_6933.CR2 - Panda PEZ dispenser at home, Oslo Noway, Canon 7D, by me
+
+Above mentioned images are freely distributable for testing purposes.
+-- Harald K

imageio/imageio-crw/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2014, Harald Kuhr
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without
+  ~ modification, are permitted provided that the following conditions are met:
+  ~     * Redistributions of source code must retain the above copyright
+  ~       notice, this list of conditions and the following disclaimer.
+  ~     * Redistributions in binary form must reproduce the above copyright
+  ~       notice, this list of conditions and the following disclaimer in the
+  ~       documentation and/or other materials provided with the distribution.
+  ~     * Neither the name "TwelveMonkeys" nor the
+  ~       names of its contributors may be used to endorse or promote products
+  ~       derived from this software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  ~ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  ~ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  ~ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  ~ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  ~ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>imageio</artifactId>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <version>3.8.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>imageio-crw</artifactId>
+    <name>TwelveMonkeys :: ImageIO :: CRW plugin</name>
+    <description>ImageIO plugin for Canon RAW (CRW) format.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-metadata</artifactId>
+        </dependency>
+        <dependency>
+            <version>${project.version}</version>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-jpeg</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/CRW.java

@@ -0,0 +1,12 @@
+package com.twelvemonkeys.imageio.plugins.crw;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * CRW
+ *
+ * @see <a href="https://sno.phy.queensu.ca/~phil/exiftool/canon_raw.html">The Canon RAW (CRW) File Format</a>
+ */
+public interface CRW {
+    int TAG_SLICES = 50752;
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/CRWDecoder.java

@@ -0,0 +1,388 @@
+package com.twelvemonkeys.imageio.plugins.crw;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.Arrays;
+
+import javax.imageio.stream.ImageInputStream;
+
+/**
+ * CRWDecoder
+ *
+ * @see <a href="http://cybercom.net/~dcoffin/dcraw/decompress.c">A simple reference decompressor for CRW files</a>
+ * @author Harald Kuhr (Java port)
+ * @author Dave Coffin (original decompress.c)
+ */
+final class CRWDecoder {
+
+    static class Decode {
+        Decode[] branch = new Decode[2];
+        int leaf;
+    }
+
+    private final ImageInputStream imageInput;
+
+    private final int height;
+    private final int width;
+    private final int table;
+
+    private Decode[] first_decode = new Decode[32];
+    private Decode[] second_decode = new Decode[512];
+
+    CRWDecoder(ImageInputStream imageInput, int width, int height, int table) {
+        this.imageInput = imageInput;
+        this.width = width;
+        this.height = height;
+        this.table = table;
+    }
+
+    /**
+     * Returns {@code false} if the image starts with compressed data,
+     * {@code true} if it starts with uncompressed low-order bits.
+     * <p>
+     * In Canon compressed data, 0xff is always followed by 0x00.
+     */
+    private boolean canonHasLowbits() throws IOException {
+        byte[] test = new byte[0x4000]; // TODO: Should probably be  (height * width / 4) * enough bytes...
+
+        imageInput.seek(0);
+        imageInput.readFully(test);
+
+        boolean ret = true;
+//        for (int i = 540; i < test.length - 1; i++) {
+        for (int i = 0; i < test.length - 1; i++) { // Note: The original 540 is probably CIFF header length + offset (26 + 514)
+            if ((test[i] & 0xff) == 0xff) {
+                if (test[i + 1] != 0) {
+                    return true;
+                }
+                ret = false;
+            }
+        }
+        return ret;
+    }
+
+
+    /*
+       A rough description of Canon's compression algorithm:
+
+        +  Each pixel outputs a 10-bit sample, from 0 to 1023.
+        +  Split the data into blocks of 64 samples each.
+        +  Subtract from each sample the value of the sample two positions
+           to the left, which has the same color filter.  From the two
+           leftmost samples in each row, subtract 512.
+        +  For each nonzero sample, make a token consisting of two four-bit
+           numbers.  The low nibble is the number of bits required to
+           represent the sample, and the high nibble is the number of
+           zero samples preceding this sample.
+        +  Output this token as a variable-length bitstring using
+           one of three tablesets.  Follow it with a fixed-length
+           bitstring containing the sample.
+
+       The "first_decode" table is used for the first sample in each
+       block, and the "second_decode" table is used for the others.
+     */
+
+    /**
+     * Construct a decode tree according the specification in *source.
+     * The first 16 bytes specify how many codes should be 1-bit, 2-bit
+     * 3-bit, etc.  Bytes after that are the leaf values.
+     * <p>
+     * For example, if the source is
+     * <p>
+     * { 0,1,4,2,3,1,2,0,0,0,0,0,0,0,0,0,
+     * 0x04,0x03,0x05,0x06,0x02,0x07,0x01,0x08,0x09,0x00,0x0a,0x0b,0xff  },
+     * <p>
+     * then the code is
+     * <p>
+     * 00		0x04
+     * 010		0x03
+     * 011		0x05
+     * 100		0x06
+     * 101		0x02
+     * 1100		0x07
+     * 1101		0x01
+     * 11100		0x08
+     * 11101		0x09
+     * 11110		0x00
+     * 111110		0x0a
+     * 1111110		0x0b
+     * 1111111		0xff
+     */
+    private Decode[] free;	/* Next unused node */
+    private int freeIndex;
+    private int leaf;		/* no. of leaves already added */
+
+    //    private void make_decoder(struct decode *dest, const uchar *source, int level)
+    private void make_decoder(Decode[] dest, int destIndex, final byte[] source, int level) {
+//        static struct decode *free;	/* Next unused node */
+//        static int leaf;		/* no. of leaves already added */
+        int i, next;
+
+        if (level==0) {
+            free = dest;
+            freeIndex = 0;
+
+            leaf = 0;
+        }
+//        free++;
+        freeIndex++;
+        // At what level should the next leaf appear?
+        for (i=next=0; i <= leaf && next < 16; ) {
+            i += (source[next++] & 0xff);
+        }
+
+        if (i > leaf) {
+            if (level < next) {        /* Are we there yet? */
+//                dest->branch[0] = free;
+//                make_decoder(free, source, level + 1);
+                dest[destIndex].branch[0] = free[freeIndex];
+                make_decoder(free, freeIndex, source, level + 1);
+//                dest->branch[1] = free;
+//                make_decoder(free, source, level + 1);
+                dest[destIndex].branch[1] = free[freeIndex];
+                make_decoder(free, freeIndex, source, level + 1);
+            } else {
+//                dest->leaf = source[16 + leaf++];
+                dest[destIndex].leaf = (source[16 + leaf++] & 0xff);
+            }
+        }
+    }
+
+    static final byte[][] first_tree/*[3][29]*/ = {
+            { 0,1,4,2,3,1,2,0,0,0,0,0,0,0,0,0,
+                    0x04,0x03,0x05,0x06,0x02,0x07,0x01,0x08,0x09,0x00,0x0a,0x0b, (byte) 0xff},
+
+            { 0,2,2,3,1,1,1,1,2,0,0,0,0,0,0,0,
+                    0x03,0x02,0x04,0x01,0x05,0x00,0x06,0x07,0x09,0x08,0x0a,0x0b, (byte) 0xff},
+
+            { 0,0,6,3,1,1,2,0,0,0,0,0,0,0,0,0,
+                    0x06,0x05,0x07,0x04,0x08,0x03,0x09,0x02,0x00,0x0a,0x01,0x0b, (byte) 0xff},
+    };
+
+    static final byte[][] second_tree/*[3][180]*/ = {
+            { 0,2,2,2,1,4,2,1,2,5,1,1,0,0,0, (byte) 139,
+                    0x03,0x04,0x02,0x05,0x01,0x06,0x07,0x08,
+                    0x12,0x13,0x11,0x14,0x09,0x15,0x22,0x00,0x21,0x16,0x0a, (byte) 0xf0,
+                    0x23,0x17,0x24,0x31,0x32,0x18,0x19,0x33,0x25,0x41,0x34,0x42,
+                    0x35,0x51,0x36,0x37,0x38,0x29,0x79,0x26,0x1a,0x39,0x56,0x57,
+                    0x28,0x27,0x52,0x55,0x58,0x43,0x76,0x59,0x77,0x54,0x61, (byte) 0xf9,
+                    0x71,0x78,0x75, (byte) 0x96, (byte) 0x97,0x49, (byte) 0xb7,0x53, (byte) 0xd7,0x74, (byte) 0xb6, (byte) 0x98,
+                    0x47,0x48, (byte) 0x95,0x69, (byte) 0x99, (byte) 0x91, (byte) 0xfa, (byte) 0xb8,0x68, (byte) 0xb5, (byte) 0xb9, (byte) 0xd6,
+                    (byte) 0xf7, (byte) 0xd8,0x67,0x46,0x45, (byte) 0x94,(byte) 0x89,(byte) 0xf8,(byte) 0x81,(byte) 0xd5,(byte) 0xf6,(byte) 0xb4,
+                    (byte) 0x88,(byte) 0xb1,0x2a,0x44,0x72,(byte) 0xd9,(byte) 0x87,0x66,(byte) 0xd4,(byte) 0xf5,0x3a,(byte) 0xa7,
+                    0x73,(byte) 0xa9,(byte) 0xa8,(byte) 0x86,0x62,(byte) 0xc7,0x65,(byte) 0xc8,(byte) 0xc9,(byte) 0xa1,(byte) 0xf4,(byte) 0xd1,
+                    (byte) 0xe9,0x5a,(byte) 0x92,(byte) 0x85,(byte) 0xa6,(byte) 0xe7,(byte) 0x93,(byte) 0xe8,(byte) 0xc1,(byte) 0xc6,0x7a,0x64,
+                    (byte) 0xe1,0x4a,0x6a,(byte) 0xe6,(byte) 0xb3,(byte) 0xf1,(byte) 0xd3,(byte) 0xa5,(byte) 0x8a,(byte) 0xb2,(byte) 0x9a,(byte) 0xba,
+                    (byte) 0x84,(byte) 0xa4,0x63,(byte) 0xe5,(byte) 0xc5,(byte) 0xf3,(byte) 0xd2,(byte) 0xc4,(byte) 0x82,(byte) 0xaa,(byte) 0xda,(byte) 0xe4,
+                    (byte) 0xf2,(byte) 0xca,(byte) 0x83,(byte) 0xa3,(byte) 0xa2,(byte) 0xc3,(byte) 0xea,(byte) 0xc2,(byte) 0xe2,(byte) 0xe3,(byte) 0xff,(byte) 0xff  },
+
+            { 0,2,2,1,4,1,4,1,3,3,1,0,0,0,0, (byte) 140,
+                    0x02,0x03,0x01,0x04,0x05,0x12,0x11,0x06,
+                    0x13,0x07,0x08,0x14,0x22,0x09,0x21,0x00,0x23,0x15,0x31,0x32,
+                    0x0a,0x16,(byte) 0xf0,0x24,0x33,0x41,0x42,0x19,0x17,0x25,0x18,0x51,
+                    0x34,0x43,0x52,0x29,0x35,0x61,0x39,0x71,0x62,0x36,0x53,0x26,
+                    0x38,0x1a,0x37,(byte) 0x81,0x27,(byte) 0x91,0x79,0x55,0x45,0x28,0x72,0x59,
+                    (byte) 0xa1,(byte) 0xb1,0x44,0x69,0x54,0x58,(byte) 0xd1,(byte) 0xfa,0x57,(byte) 0xe1,(byte) 0xf1,(byte) 0xb9,
+                    0x49,0x47,0x63,0x6a,(byte) 0xf9,0x56,0x46,(byte) 0xa8,0x2a,0x4a,0x78,(byte) 0x99,
+                    0x3a,0x75,0x74,(byte) 0x86,0x65,(byte) 0xc1,0x76,(byte) 0xb6,(byte) 0x96,(byte) 0xd6,(byte) 0x89,(byte) 0x85,
+                    (byte) 0xc9,(byte) 0xf5,(byte) 0x95,(byte) 0xb4,(byte) 0xc7,(byte) 0xf7,(byte) 0x8a,(byte) 0x97,(byte) 0xb8,0x73,(byte) 0xb7,(byte) 0xd8,
+                    (byte) 0xd9,(byte) 0x87,(byte) 0xa7,0x7a,0x48,(byte) 0x82,(byte) 0x84,(byte) 0xea,(byte) 0xf4,(byte) 0xa6,(byte) 0xc5,0x5a,
+                    (byte) 0x94,(byte) 0xa4,(byte) 0xc6,(byte) 0x92,(byte) 0xc3,0x68,(byte) 0xb5,(byte) 0xc8,(byte) 0xe4,(byte) 0xe5,(byte) 0xe6,(byte) 0xe9,
+                    (byte) 0xa2,(byte) 0xa3,(byte) 0xe3,(byte) 0xc2,0x66,0x67,(byte) 0x93,(byte) 0xaa,(byte) 0xd4,(byte) 0xd5,(byte) 0xe7,(byte) 0xf8,
+                    (byte) 0x88,(byte) 0x9a,(byte) 0xd7,0x77,(byte) 0xc4,0x64,(byte) 0xe2,(byte) 0x98,(byte) 0xa5,(byte) 0xca,(byte) 0xda,(byte) 0xe8,
+                    (byte) 0xf3,(byte) 0xf6,(byte) 0xa9,(byte) 0xb2,(byte) 0xb3,(byte) 0xf2,(byte) 0xd2,(byte) 0x83,(byte) 0xba,(byte) 0xd3,(byte) 0xff,(byte) 0xff  },
+
+            { 0,0,6,2,1,3,3,2,5,1,2,2,8,10,0,117,
+                    0x04,0x05,0x03,0x06,0x02,0x07,0x01,0x08,
+                    0x09,0x12,0x13,0x14,0x11,0x15,0x0a,0x16,0x17,(byte) 0xf0,0x00,0x22,
+                    0x21,0x18,0x23,0x19,0x24,0x32,0x31,0x25,0x33,0x38,0x37,0x34,
+                    0x35,0x36,0x39,0x79,0x57,0x58,0x59,0x28,0x56,0x78,0x27,0x41,
+                    0x29,0x77,0x26,0x42,0x76,(byte) 0x99,0x1a,0x55,(byte) 0x98,(byte) 0x97,(byte) 0xf9,0x48,
+                    0x54,(byte) 0x96,(byte) 0x89,0x47,(byte) 0xb7,0x49,(byte) 0xfa,0x75,0x68,(byte) 0xb6,0x67,0x69,
+                    (byte) 0xb9,(byte) 0xb8,(byte) 0xd8,0x52,(byte) 0xd7,(byte) 0x88,(byte) 0xb5,0x74,0x51,0x46,(byte) 0xd9,(byte) 0xf8,
+                    0x3a,(byte) 0xd6,(byte) 0x87,0x45,0x7a,(byte) 0x95,(byte) 0xd5,(byte) 0xf6,(byte) 0x86,(byte) 0xb4,(byte) 0xa9,(byte) 0x94,
+                    0x53,0x2a,(byte) 0xa8,0x43,(byte) 0xf5,(byte) 0xf7,(byte) 0xd4,0x66,(byte) 0xa7,0x5a,0x44,(byte) 0x8a,
+                    (byte) 0xc9,(byte) 0xe8,(byte) 0xc8,(byte) 0xe7,(byte) 0x9a,0x6a,0x73,0x4a,0x61,(byte) 0xc7,(byte) 0xf4,(byte) 0xc6,
+                    0x65,(byte) 0xe9,0x72,(byte) 0xe6,0x71,(byte) 0x91,(byte) 0x93,(byte) 0xa6,(byte) 0xda,(byte) 0x92,(byte) 0x85,0x62,
+                    (byte) 0xf3,(byte) 0xc5,(byte) 0xb2,(byte) 0xa4,(byte) 0x84,(byte) 0xba,0x64,(byte) 0xa5,(byte) 0xb3,(byte) 0xd2,(byte) 0x81,(byte) 0xe5,
+                    (byte) 0xd3,(byte) 0xaa,(byte) 0xc4,(byte) 0xca,(byte) 0xf2,(byte) 0xb1,(byte) 0xe4,(byte) 0xd1,(byte) 0x83,0x63,(byte) 0xea,(byte) 0xc3,
+                    (byte) 0xe2,(byte) 0x82,(byte) 0xf1,(byte) 0xa3,(byte) 0xc2,(byte) 0xa1,(byte) 0xc1,(byte) 0xe3,(byte) 0xa2,(byte) 0xe1,(byte) 0xff,(byte) 0xff  }
+    };
+
+    private void init_tables(int table) {
+        if (table > 2) table = 2;
+//        memset( first_decode, 0, sizeof first_decode);
+//        memset(second_decode, 0, sizeof second_decode);
+//        make_decoder( first_decode, first_tree[table], 0);
+//        make_decoder(second_decode, second_tree[table], 0);
+
+        for (int i = 0; i < first_decode.length; i++) {
+            first_decode[i] = new Decode();
+        }
+        for (int i = 0; i < second_decode.length; i++) {
+            second_decode[i] = new Decode();
+        }
+
+        make_decoder( first_decode, 0, first_tree[table], 0);
+        make_decoder(second_decode, 0, second_tree[table], 0);
+    }
+
+//#if 0
+//    writebits (int val, int nbits)
+//    {
+//        val <<= 32 - nbits;
+//        while (nbits--) {
+//            putchar(val & 0x80000000 ? '1':'0');
+//            val <<= 1;
+//        }
+//    }
+//#endif
+
+/*
+   getbits(-1) initializes the buffer
+   getbits(n) where 0 <= n <= 25 returns an n-bit integer
+*/
+    private int bitbuf=0;
+    private int vbits=0;
+
+    int getbits(int nbits) throws IOException {
+        int  c;
+
+        if (nbits == 0) return 0;
+
+        int ret;
+
+        if (nbits == -1) {
+            ret = bitbuf = vbits = 0;
+        }
+        else {
+//            ret = bitbuf << (32 - vbits) >> (32 - nbits);
+            ret = bitbuf << (32 - vbits) >>> (32 - nbits);
+            vbits -= nbits;
+        }
+        while (vbits < 25) {
+//            c=fgetc(ifp);
+            c=imageInput.readUnsignedByte();
+            bitbuf = (bitbuf << 8) + c;
+//            if (c == 0xff) fgetc(ifp);	/* always extra 00 after ff */
+            if (c == 0xff) {
+                imageInput.readUnsignedByte();	// always extra 00 after ff
+            }
+            vbits += 8;
+        }
+
+        return ret;
+    }
+
+    short[] decode() throws IOException {
+        short[] result = new short[width * height];
+
+//        struct Decode *decode, *dindex;
+        Decode decode;
+        Decode dindex;
+        int i, j, leaf, len, diff, r;
+                long save;
+        int[] diffbuf = new int[64]; // h * w = 8 * 8 for each compressed block
+        int carry=0, column=0;
+        int[] base = new int[2];
+//        unsigned short outbuf[64];
+        short[] outbuf = new short[64];
+
+        int c;
+
+        boolean lowbits = canonHasLowbits();
+
+        init_tables(table);
+
+//        fseek (ifp, 540 + lowbits*height*width/4, SEEK_SET);
+//        imageInput.seek(540 + (lowbits ? 1 : 0) * height * width / 4);
+        imageInput.seek((lowbits ? 1 : 0) * height * width / 4); // NOTE: The original 540 offset is probably CIFF header length: 26 + DecoderTable[2]: 514
+        getbits(-1);			/* Prime the bit buffer */
+
+        while (column < width * height) {
+//            memset(diffbuf,0,sizeof diffbuf);
+            Arrays.fill(diffbuf, 0);
+
+//            decode = first_decode;
+            decode = first_decode[0];
+            for (i = 0; i < 64; i++) {
+
+//                for (dindex=decode; dindex->branch[0]; )
+//                    dindex = dindex->branch[getbits(1)];
+                for (dindex = decode; dindex.branch[0] != null; ) {
+                    dindex = dindex.branch[getbits(1)];
+                }
+
+//                leaf = dindex->leaf;
+                leaf = dindex.leaf;
+//                decode = second_decode;
+                decode = second_decode[0];
+
+                if (leaf == 0 && i != 0) {
+                    break;
+                }
+                if (leaf == 0xff) {
+                    continue;
+                }
+
+                i += (leaf >> 4);
+                len = leaf & 15;
+
+                if (len == 0) {
+                    continue;
+                }
+                diff = getbits(len);
+                if ((diff & (1 << (len - 1))) == 0) {
+                    diff -= (1 << len) - 1;
+                }
+
+                if (i < 64) {
+                    diffbuf[i] = diff;
+                }
+            }
+
+            // --- Ok ---
+
+            diffbuf[0] += carry;
+            carry = diffbuf[0];
+
+            for (i = 0; i < 64; i++) {
+                if (column++ % width == 0) {
+                    base[0] = base[1] = 512;
+                }
+
+                // TODO: The original C code uses unsigned short, so this may overflow differently
+                // outbuf[i] = ( base[i & 1] += diffbuf[i] );
+
+                outbuf[i] = (short) (base[i & 1] += diffbuf[i]);
+            }
+
+            // -- Ok ---
+
+            if (lowbits) {
+//                save = ftell(ifp);
+                save = imageInput.getStreamPosition();
+//                fseek (ifp, (column-64)/4 + 26, SEEK_SET);
+//                    imageInput.seek((column - 64) / 4 + 26);
+                imageInput.seek((column - 64) / 4); // Note: The original 26 is CIFF header length (?)
+                for (i = j = 0; j < 64 / 4; j++) {
+//                    c = fgetc(ifp);
+                    c = imageInput.readUnsignedByte();
+                    for (r = 0; r < 8; r += 2) {
+                        // TODO: Is this correct? The original C code is on one line, the Java equivalent then throws an AIOOBE...
+//                            outbuf[i++] = (outbuf[i] << 2) + ((c >> r) & 3);
+                        short sample = (short) ((outbuf[i] << 2) + ((c >> r) & 3));
+                        outbuf[i++] = sample;
+                    }
+                }
+//                fseek (ifp, save, SEEK_SET);
+                imageInput.seek(save);
+            }
+
+//            fwrite(outbuf,2,64,stdout);
+            System.arraycopy(outbuf, 0, result, column - 64, 64);
+        }
+
+        return result;
+    }
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/CRWImageReader.java

@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.crw;
+
+import static java.util.Collections.singletonList;
+
+import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
+import com.twelvemonkeys.imageio.plugins.crw.ciff.CIFF;
+import com.twelvemonkeys.imageio.plugins.crw.ciff.CIFFDirectory;
+import com.twelvemonkeys.imageio.plugins.crw.ciff.CIFFEntry;
+import com.twelvemonkeys.imageio.plugins.crw.ciff.CIFFReader;
+import com.twelvemonkeys.imageio.stream.BufferedImageInputStream;
+import com.twelvemonkeys.imageio.stream.SubImageInputStream;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.spi.ImageReaderSpi;
+import javax.imageio.stream.ImageInputStream;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+
+/**
+ * Canon CRW RAW ImageReader.
+ * <p/>
+ *
+ * @see <a href="http://cybercom.net/~dcoffin/dcraw/">Decoding raw digital photos in Linux</a>
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author CRW C reference decoder written by Dave Coffin.
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CRWImageReader.java,v 1.0 07.04.14 21:31 haraldk Exp$
+ */
+public final class CRWImageReader extends ImageReaderBase {
+    // TODO: Avoid duped code from TIFFImageReader, create a ExifRAWBaseImageReader something
+    // TODO: Probably a good idea to move some of the getAsShort/Int/Long/Array to TIFF/EXIF metadata module
+    // TODO: Automatic EXIF rotation, if we find a good way to do that for JPEG/EXIF/TIFF and keeping the metadata sane...
+
+    final static boolean DEBUG =  true; //"true".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.imageio.plugins.crw.debug"));
+
+    // TODO: Thumbnail may or may not be present
+
+    private CIFFDirectory heap;
+    private boolean hasJPEGPreview;
+    private boolean hasRAWData;
+
+    CRWImageReader(final ImageReaderSpi provider) {
+        super(provider);
+    }
+
+    @Override
+    protected void resetMembers() {
+        heap = null;
+        hasJPEGPreview = false;
+        hasRAWData = false;
+    }
+
+    private void readMetadata() throws IOException {
+        if (imageInput == null) {
+            throw new IllegalStateException("input not set");
+        }
+
+        if (heap == null) {
+            heap = new CIFFReader().read(imageInput);
+
+            hasJPEGPreview = heap.getEntryById(CIFF.TAG_JPEG_PREVIEW) != null;
+            hasRAWData = heap.getEntryById(CIFF.TAG_RAW_DATA) != null;
+
+            if (DEBUG) {
+                System.err.println("directory: " + heap);
+            }
+        }
+    }
+
+    @Override
+    public int getNumImages(final boolean allowSearch) throws IOException {
+        readMetadata();
+
+        return (hasJPEGPreview ? 1 : 0) + (hasRAWData ? 1 : 0);
+    }
+
+    @Override
+    public int getNumThumbnails(int imageIndex) throws IOException {
+        readMetadata();
+        checkBounds(imageIndex);
+
+        // TODO: Count thumbnails!
+        return 0;
+    }
+
+    @Override
+    public boolean readerSupportsThumbnails() {
+        return true;
+    }
+
+    @Override
+    public int getThumbnailWidth(int imageIndex, int thumbnailIndex) throws IOException {
+        readMetadata();
+        checkBounds(imageIndex);
+
+        // TODO: Need to get from JPEGImageReader (no ImageWidth tag), this is an ok (but lame) implementation for now
+        return super.getThumbnailWidth(imageIndex, thumbnailIndex);
+    }
+
+    @Override
+    public int getThumbnailHeight(int imageIndex, int thumbnailIndex) throws IOException {
+        readMetadata();
+        checkBounds(imageIndex);
+
+        // TODO: Need to get from JPEGImageReader (no ImageHeight tag), this is an ok (but lame) implementation for now
+        return super.getThumbnailHeight(imageIndex, thumbnailIndex);
+    }
+
+    @Override
+    public BufferedImage readThumbnail(int imageIndex, int thumbnailIndex) throws IOException {
+        readMetadata();
+
+        if (imageIndex != 0) {
+            throw new IndexOutOfBoundsException("No thumbnail for imageIndex: " + imageIndex);
+        }
+        if (thumbnailIndex >= getNumThumbnails(0)) {
+            throw new IndexOutOfBoundsException("thumbnailIndex out of bounds: " + thumbnailIndex);
+        }
+
+        throw new UnsupportedOperationException("readThumbnail");
+    }
+
+    @Override
+    public int getWidth(int imageIndex) throws IOException {
+        readMetadata();
+
+        if (imageIndex == 0 && hasJPEGPreview) {
+            return getJPEGPreviewDimension().width;
+        }
+
+        return getRawImageDimension().width;
+    }
+
+    @Override
+    public int getHeight(int imageIndex) throws IOException {
+        readMetadata();
+
+        if (imageIndex == 0 && hasJPEGPreview) {
+            return getJPEGPreviewDimension().height;
+        }
+
+        return getRawImageDimension().height;
+    }
+
+    private Dimension getJPEGPreviewDimension() {
+        // TODO: This is incorrect for the G1 sample, which stores the RAW size here...
+        CIFFDirectory imageProperties = heap.getSubDirectory(CIFF.TAG_IMAGE_PROPERTIES);
+        CIFFEntry imageSpec = imageProperties.getEntryById(CIFF.TAG_IMAGE_SPEC);
+        int[] imageSpecValue = (int[]) imageSpec.getValue();
+
+        return new Dimension(imageSpecValue[0], imageSpecValue[1]);
+    }
+
+    private Dimension getRawImageDimension() {
+        CIFFDirectory exifInfo = getExifInfo();
+        CIFFEntry sensorInfo = exifInfo.getEntryById(CIFF.TAG_SENSOR_INFO);
+
+        if (sensorInfo != null) {
+            short[] sensorInfoValue = (short[]) sensorInfo.getValue();
+
+            return new Dimension(sensorInfoValue[1], sensorInfoValue[2]);
+        }
+
+        // PowerShot Pro70 et al, don't have a JPEG preview and contains the dimensions in the ImageSpec tag
+        return getJPEGPreviewDimension();
+    }
+
+    private CIFFDirectory getExifInfo() {
+        CIFFDirectory imageProperties = heap.getSubDirectory(CIFF.TAG_IMAGE_PROPERTIES);
+        return imageProperties.getSubDirectory(CIFF.TAG_EXIF_INFORMATION);
+    }
+
+    @Override
+    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
+        readMetadata();
+
+        if (imageIndex == 0 && hasJPEGPreview) {
+            BufferedImage image = readJPEGPreview();
+            return singletonList(ImageTypeSpecifier.createFromRenderedImage(image)).iterator();
+        }
+
+        throw new IndexOutOfBoundsException();
+    }
+
+    @Override
+    public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException {
+        readMetadata();
+
+        if (imageIndex == 0 && hasJPEGPreview) {
+            return readJPEGPreview();
+        }
+
+        return readRAWData();
+    }
+
+    private BufferedImage readJPEGPreview() throws IOException {
+        CIFFEntry jpegPreview = heap.getEntryById(CIFF.TAG_JPEG_PREVIEW);
+
+        imageInput.seek(jpegPreview.offset());
+
+        return ImageIO.read(new SubImageInputStream(imageInput, jpegPreview.length()));
+    }
+
+    private BufferedImage readRAWData() throws IOException {
+        CIFFDirectory exifInfo = getExifInfo();
+        CIFFEntry decoderTable = exifInfo.getEntryById(CIFF.TAG_DECODER_TABLE);
+        int[] decoderTableValue = decoderTable != null ? (int[]) decoderTable.getValue() : null;
+        int table = decoderTableValue != null ? decoderTableValue[0] : 0;
+        long offset = decoderTableValue != null ? decoderTableValue[2] : 0;
+
+        Dimension size = getRawImageDimension();
+        int width = size.width;
+        int height = size.height;
+
+        // TODO: This is probably not the best way to get the bits/pixel, but seems to be correct (when it's there).
+        // However,
+        CIFFEntry whiteSample = exifInfo.getEntryById(CIFF.TAG_WHITE_SAMPLE);
+        short[] whiteSampleValue = whiteSample != null ? (short[]) whiteSample.getValue() : null;
+        short bitsPerSample = whiteSampleValue != null && whiteSample.length() > 5 ? whiteSampleValue[5] : 12;
+
+        CIFFEntry rawData = heap.getEntryById(CIFF.TAG_RAW_DATA);
+
+        imageInput.seek(rawData.offset() + offset);
+
+        ImageInputStream stream = new BufferedImageInputStream(new SubImageInputStream(imageInput, rawData.length()));
+
+        CRWDecoder decoder = new CRWDecoder(stream, width, height, table);
+        short[] data = decoder.decode();
+
+        DataBuffer dataBuffer = new DataBufferUShort(data, data.length);
+        WritableRaster raster = Raster.createInterleavedRaster(dataBuffer, width, height, width, 1, new int[] {0}, null);
+
+        ColorModel cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_GRAY), new int[]{bitsPerSample}, false, false, Transparency.OPAQUE, dataBuffer.getDataType());
+
+        return new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
+    }
+
+    public static void main(String[] args) throws IOException {
+        CRWImageReader reader = new CRWImageReader(new CRWImageReaderSpi());
+
+        for (String arg : args) {
+            ImageInputStream stream = ImageIO.createImageInputStream(new File(arg));
+            System.err.println("canDecode: " + reader.getOriginatingProvider().canDecodeInput(stream));
+
+            reader.setInput(stream);
+
+            int numImages = reader.getNumImages(true);
+            for (int i = 0; i < numImages; i++) {
+                int numThumbnails = reader.getNumThumbnails(i);
+                for (int n = 0; n < numThumbnails; n++) {
+                    showIt(reader.readThumbnail(i, n), arg + " image " + i + " thumbnail " + n);
+                }
+
+                showIt(reader.read(i), arg + " image " + i);
+            }
+        }
+    }
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/CRWImageReaderSpi.java

@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.crw;
+
+import static java.util.Arrays.copyOfRange;
+
+import com.twelvemonkeys.imageio.plugins.crw.ciff.CIFF;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
+
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Locale;
+
+import javax.imageio.spi.ImageReaderSpi;
+import javax.imageio.spi.ServiceRegistry;
+
+/**
+ * CRWImageReaderSpi
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CRWImageReaderSpi.java,v 1.0 07.04.14 21:26 haraldk Exp$
+ */
+public final class CRWImageReaderSpi extends ImageReaderSpiBase {
+    @SuppressWarnings("WeakerAccess")
+    public CRWImageReaderSpi() {
+        super(new CRWProviderInfo());
+    }
+
+    @Override
+    public void onRegistration(ServiceRegistry registry, Class<?> category) {
+        // TODO: This code assumes that any TIFFImageReaderSpi is already installed... It may be installed at a later time. :-(
+        // Make sure we're ordered before any TIFF reader
+        Iterator<ImageReaderSpi> spis = registry.getServiceProviders(ImageReaderSpi.class, new ServiceRegistry.Filter() {
+            @Override
+            public boolean filter(Object provider) {
+                return provider instanceof ImageReaderSpi && isTIFFReaderSpi((ImageReaderSpi) provider);
+            }
+
+            private boolean isTIFFReaderSpi(final ImageReaderSpi provider) {
+                String[] formatNames = provider.getFormatNames();
+                for (String formatName : formatNames) {
+                    if (formatName.equalsIgnoreCase("TIFF")) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }, true);
+
+        while (spis.hasNext()) {
+            ImageReaderSpi spi = spis.next();
+            registry.setOrdering(ImageReaderSpi.class, this, spi);
+        }
+    }
+
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        if (!(pSource instanceof ImageInputStream)) {
+            return false;
+        }
+
+        ImageInputStream stream = (ImageInputStream) pSource;
+
+        stream.mark();
+        try {
+            byte[] bom = new byte[2];
+            stream.readFully(bom);
+
+            ByteOrder originalOrder = stream.getByteOrder();
+
+            try {
+                // CIFF byte order mark II (Intel) or MM (Motorola), just like TIFF
+                if (bom[0] == 'I' && bom[1] == 'I') {
+                    stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+                }
+                else if (bom[0] == 'M' && bom[1] == 'M') {
+                    stream.setByteOrder(ByteOrder.BIG_ENDIAN);
+                }
+                else  {
+                    return false;
+                }
+
+                // CIFF header is always 26 bytes
+                int size = stream.readInt();
+                if (size != CIFF.HEADER_SIZE) {
+                    return false;
+                }
+
+                // CRW uses type HEAP and subtype CCDR
+                byte[] type = new byte[8];
+                stream.readFully(type);
+
+                if (!Arrays.equals(CIFF.TYPE_HEAP, copyOfRange(type, 0, 4))
+                    || !Arrays.equals(CIFF.SUBTYPE_CCDR, copyOfRange(type, 4, 8))) {
+                    return false;
+                }
+
+                // Version 1.2
+                return stream.readUnsignedInt() == CIFF.VERSION_1_2;
+            }
+            finally {
+                stream.setByteOrder(originalOrder);
+            }
+        }
+        finally {
+            stream.reset();
+        }
+    }
+
+    @Override
+    public CRWImageReader createReaderInstance(Object extension) {
+        return new CRWImageReader(this);
+    }
+
+    @Override
+    public String getDescription(Locale locale) {
+        return "Canon RAW (CRW) format Reader";
+    }
+
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/CRWProviderInfo.java

@@ -0,0 +1,29 @@
+package com.twelvemonkeys.imageio.plugins.crw;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * CRWProviderInfo
+ */
+final class CRWProviderInfo extends ReaderWriterProviderInfo {
+    CRWProviderInfo() {
+        super(
+                CRWProviderInfo.class,
+                new String[] {"crw", "CRW"},
+                new String[] {"crw"},
+                new String[] {
+                        "image/x-canon-raw",               // TODO: Look up
+                },
+                "CRWImageReader",
+                new String[] {"CRWImageReaderSpi"},
+                null,
+                null,
+                false,
+                null, null,
+                null, null,
+                true,
+                null, null,
+                null, null
+                );
+    }
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/Slice.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2018, Oleg Ermolaev
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.crw;
+
+import javax.imageio.IIOException;
+import java.util.Arrays;
+
+/**
+ * For CR2 RAW image.
+ *
+ * @author Oleg Ermolaev Date: 05.05.2018 2:04
+ */
+final class Slice {
+    private final int firstWidthCount;
+    private final int firstWidth;
+    private final int lastWidth;
+
+    private Slice(int firstWidthCount, int firstWidth, int lastWidth) {
+        this.firstWidthCount = firstWidthCount;
+        this.firstWidth = firstWidth;
+        this.lastWidth = lastWidth;
+    }
+
+    static Slice createSlice(long[] values) throws IIOException {
+        if (values == null || values.length != 3) {
+            throw new IIOException("Unexpected slices array: " + Arrays.toString(values));
+        }
+
+        long firstWidthCount = values[0];
+        long firstWidth = values[1];
+        long lastWidth = values[2];
+
+        if (!(0 < firstWidthCount && firstWidthCount <= Integer.MAX_VALUE) ||
+                !(0 < firstWidth && firstWidth <= Integer.MAX_VALUE) ||
+                !(0 < lastWidth && lastWidth <= Integer.MAX_VALUE) ||
+                firstWidthCount * firstWidth + lastWidth > Integer.MAX_VALUE) {
+            throw new IIOException("Unexpected slices array: " + Arrays.toString(values));
+        }
+
+        return new Slice((int) firstWidthCount, (int) firstWidth, (int) lastWidth);
+    }
+
+    private int getWidth() {
+        return firstWidthCount * firstWidth + lastWidth;
+    }
+
+    int[] unslice(int[][] data, int componentCount, int height) throws IIOException {
+        final int width = getWidth();
+        final int[] result = new int[width * height];
+
+        for (int componentIndex = 0; componentIndex < componentCount; componentIndex++) {
+            if (result.length != data[componentIndex].length * componentCount) {
+                throw new IIOException(String.format("Invalid array size for component #%d", componentIndex));
+            }
+        }
+
+        int position = 0;
+        int currentWidth = firstWidth / componentCount;
+
+        for (int sliceIndex = 0; sliceIndex < firstWidthCount + 1; ++sliceIndex) {
+            if (sliceIndex == firstWidthCount) {
+                currentWidth = lastWidth / componentCount;
+            }
+
+            final int sliceOffset = sliceIndex * firstWidth;
+            for (int y = 0; y < height; ++y) {
+                final int yOffset = y * width;
+
+                for (int x = 0; x < currentWidth; ++x) {
+                    final int xOffset = x * componentCount;
+
+                    for (int componentIndex = 0; componentIndex < componentCount; componentIndex++) {
+                        result[sliceOffset + yOffset + xOffset + componentIndex] = data[componentIndex][position];
+                    }
+
+                    position++;
+                }
+            }
+        }
+
+        return result;
+    }
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/ciff/CIFF.java

@@ -0,0 +1,158 @@
+package com.twelvemonkeys.imageio.plugins.crw.ciff;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * CIFF
+ *
+ * @see <a href="http://xyrion.org/ciff/CIFFspecV1R04.pdf">CIFF: Specification on Image Data File</a>
+ */
+public interface CIFF {
+
+    int HEADER_SIZE = 26;
+    int VERSION_1_2 = 0x00010002;
+
+    byte[] TYPE_HEAP = "HEAP".getBytes(StandardCharsets.US_ASCII);
+
+    // According to CIFF spec, other subtypes are "JPGM", "TIFP" and "ARCH".
+    byte[] SUBTYPE_ARCH = "ARCH".getBytes(StandardCharsets.US_ASCII);
+    byte[] SUBTYPE_CCDR = "CCDR".getBytes(StandardCharsets.US_ASCII);
+    byte[] SUBTYPE_JPGM = "JPGM".getBytes(StandardCharsets.US_ASCII);
+    byte[] SUBTYPE_TIFP = "TIFP".getBytes(StandardCharsets.US_ASCII);
+
+    int STORAGE_HEAP = 0x0000;      // kStg_InHeapSpace
+    int STORAGE_RECORD = 0x4000;    // kStg_InRecordEntry
+
+    int DATA_TYPE_BYTE = 0x0000;
+    int DATA_TYPE_ASCII = 0x0800;
+    int DATA_TYPE_WORD = 0x1000;
+    int DATA_TYPE_DWORD = 0x1800;
+    int DATA_TYPE_UNDEFINED = 0x2000; // kDT_BYTE2
+
+    int DATA_TYPE_HEAP_1 = 0x2800; // kDT_HeapTypeProperty1
+    int DATA_TYPE_HEAP_2 = 0x3000; // kDT_HeapTypeProperty2
+
+    // From Spec
+    int TAG_WILDCARD = 0xffff;
+    int TAG_NULL = 0x0000;      // null record
+    int TAG_FREE = 0x0001;      // free record
+    int TAG_EX_USED = 0x0002;   // special type for implementation purpose
+
+    int TAG_DESCRIPTION = DATA_TYPE_ASCII | 0x0005;
+    int TAG_MODEL_NAME = DATA_TYPE_ASCII | 0x000a;
+    int TAG_FIRMWARE_VERSION = DATA_TYPE_ASCII | 0x000b;
+    int TAG_COMPONENT_VERSION = DATA_TYPE_ASCII | 0x000c;
+    int TAG_ROM_OPERATION_MODE = DATA_TYPE_ASCII | 0x000d;
+    int TAG_OWNER_NAME = DATA_TYPE_ASCII | 0x0010;
+    int TAG_IMAGE_FILE_NAME = DATA_TYPE_ASCII | 0x0016;
+    int TAG_THUMBNAIL_FILE_NAME = DATA_TYPE_ASCII | 0x0017;
+    int TAG_TARGET_IMAGE_TYPE = DATA_TYPE_WORD | 0x000a;
+    int TAG_SR_RELEASE_METHOD = DATA_TYPE_WORD | 0x0010;
+    int TAG_SR_RELEASE_TIMING = DATA_TYPE_WORD | 0x0011;
+    int TAG_RELEASE_SETTING = DATA_TYPE_WORD | 0x0016;
+    int TAG_BODY_SENSITIVITY = DATA_TYPE_WORD | 0x001c;
+    int TAG_IMAGE_FORMAT = DATA_TYPE_DWORD | 0x0003;
+    int TAG_RECORD_ID = DATA_TYPE_DWORD | 0x0004;
+    int TAG_SELF_TIMER_TIME = DATA_TYPE_DWORD | 0x0006;
+    int TAG_SR_TARGET_DISTANCE_SETTING = DATA_TYPE_DWORD | 0x0007;
+    int TAG_BODY_ID = DATA_TYPE_DWORD | 0x000b;
+    int TAG_CAPTURED_TIME = DATA_TYPE_DWORD | 0x000e;
+    int TAG_IMAGE_SPEC = DATA_TYPE_DWORD | 0x0010;
+    int TAG_SR_EF = DATA_TYPE_DWORD | 0x0013;
+    int TAG_MI_EV = DATA_TYPE_DWORD | 0x0014;
+    int TAG_SERIAL_NUMBER = DATA_TYPE_DWORD | 0x0017;
+    int TAG_SR_EXPOSURE = DATA_TYPE_DWORD | 0x0018;
+    int TAG_CAMERA_OBJECT = 0x0007 | DATA_TYPE_HEAP_1;
+    int TAG_SHOOTING_RECORD = 0x0002 | DATA_TYPE_HEAP_2;
+    int TAG_MEASURED_INFO = 0x0003 | DATA_TYPE_HEAP_2;
+    int TAG_CAMERA_SPECIFICATiON = 0x0004 | DATA_TYPE_HEAP_2; // kTC_CameraSpecificaiton
+
+    // From Phil Harvey's ExifTool (https://sno.phy.queensu.ca/~phil/exiftool/canon_raw.html)
+
+    // 0x0006	-	0x300b	-	8	-
+    int TAG_CANON_COLOR_INFO1 = DATA_TYPE_BYTE | 0x0032; //  - Subdir: 0x300b, Exif: -
+    // 0x0036	-	0x300b	?	varies	-
+    // 0x003f	-	0x300b	?	5120	-
+    // 0x0040	-	0x300b	?	256	-
+    // 0x0041	-	0x300b	?	256	-
+
+    // ASCII Strings
+//    int TAG_CANON_FILE_DESCRIPTION = 0x0805; //  - Subdir: 0x2804, Exif: -
+//    int TAG_USER_COMMENT = DATA_TYPE_ASCII | 0x0005; //  - Subdir: 0x300a, Exif: -
+//    int TAG_CANON_RAW_MAKE_MODEL    = DATA_TYPE_ASCII | 0x080a; //  - Subdir: 0x2807, Exif: -
+//    int TAG_CANON_FIRMWARE_VERSION  = DATA_TYPE_ASCII | 0x080b; // 32	Firmware version. eg) "Firmware Version 1.1.1" - Subdir: 0x3004, Exif: 0x07
+//    int TAG_COMPONENT_VERSION = 0x080c;	// ?
+//    int TAG_ROM_OPERATION_MODE = 0x080d; // 4	eg) The string "USA" for 300D's sold in North America - Subdir: 0x3004, Exif: -
+//    int TAG_OWNER_NAME = 0x0810; // 32	Owner's name. eg) "Phil Harvey" - Subdir: 0x2807, Exif: 0x09
+    int TAG_CANON_IMAGE_TYPE        = DATA_TYPE_ASCII | 0x0815; // 32	Type of file. eg) "CRW:EOS DIGITAL REBEL CMOS RAW" - Subdir: 0x2804, Exif: 0x06
+//    int TAG_ORIGINAL_FILE_NAME = 0x0816; // 32	Original file name. eg) "CRW_1834.CRW" - Subdir: 0x300a, Exif: -
+//    int TAG_THUMBNAIL_FILE_NAME = 0x0817; // 32	Thumbnail file name. eg) "CRW_1834.THM" - Subdir: 0x300a, Exif: -
+
+    // SHORT (2-Byte Alignmnt)
+//    int TAG_TARGET_IMAGE_TYPE = 0x100a; // 2	0=real-world subject, 1=written document - Subdir: 0x300a, Exif: -
+//    int TAG_SHUTTER_RELEASE_METHOD = 0x1010; // 2	0=single shot, 1=continuous shooting - Subdir: 0x3002, Exif: -
+//    int TAG_SHUTTER_RELEASE_TIMING = 0x1011; // 2	0=priority on shutter, 1=priority on focus - Subdir: 0x3002, Exif: -
+    // 0x1014	-	0x3002	-	8	-
+//    int TAG_RELEASE_SETTING = 0x1016; // 2	- - Subdir: 0x3002, Exif: -
+    int TAG_BASE_ISO                = DATA_TYPE_WORD | 0x101c; // 2	The camera body's base ISO sensitivity - Subdir: 0x3004, Exif: -
+    // 0x1026	-	0x300a	-	6	-
+    int TAG_CANON_FLASH_INFO        = DATA_TYPE_WORD | 0x1028; // 8	Unknown information, flash related - Subdir: 0x300b, Exif: 0x03
+    int TAG_FOCAL_LENGTH            = DATA_TYPE_WORD | 0x1029; // 8	Four 16 bit integers: 0) unknown, 1) focal length in mm, 2-3) sensor width and height in units of 1/1000 inch - Subdir: 0x300b, Exif: 0x02
+    int TAG_CANON_SHOT_INFO         = DATA_TYPE_WORD | 0x102a; // varies	Data block giving shot information - Subdir: 0x300b, Exif: 0x04
+    int TAG_CANON_COLOR_INFO2       = DATA_TYPE_WORD | 0x102c; // 256	Data block of color information (format unknown) - Subdir: 0x300b, Exif: -
+    int TAG_CANON_CAMERA_SETTINGS   = DATA_TYPE_WORD | 0x102d; // varies	Data block giving camera settings - Subdir: 0x300b, Exif: 0x01
+    int TAG_WHITE_SAMPLE            = DATA_TYPE_WORD | 0x1030; // 102 or 118	White sample information with encrypted 8x8 sample data - Subdir: 0x300b, Exif: -
+    int TAG_SENSOR_INFO             = DATA_TYPE_WORD | 0x1031; // 34	Sensor size and resolution information - Subdir: 0x300b, Exif: -
+    int TAG_CANON_CUSTOM_FUNCTIONS  = DATA_TYPE_WORD | 0x1033; // varies	Data block giving Canon custom settings - Subdir: 0x300b, Exif: 0x0f
+    int TAG_CANON_AF_INFO           = DATA_TYPE_WORD | 0x1038; // varies	Data block giving AF-specific information - Subdir: 0x300b, Exif: 0x12
+    // 0x1039	0x13	0x300b	?	8	-
+    // 0x103c	-	0x300b	?	156	-
+    // 0x107f	-	0x300b	-	varies	-
+    int TAG_CANON_FILE_INFO         = DATA_TYPE_WORD | 0x1093; // 18	Data block giving file-specific information - Subdir: 0x300b, Exif: 0x93
+    // 0x10a8	0xa8	0x300b	?	20	-
+    int TAG_COLOR_BALANCE           = DATA_TYPE_WORD | 0x10a9; // 82	Table of 16-bit integers. The first integer (like many other data blocks) is the number of bytes in the record. This is followed by red, green1, green2 and blue levels for WhiteBalance settings: auto, daylight, shade, cloudy, tungsten, fluorescent, flash, custom and kelvin. The final 4 entries appear to be some sort of baseline red, green1, green2 and blue levels. - Subdir: 0x300b, Exif: 0xa9
+    // 0x10aa	0xaa	0x300b	?	10	-
+    // 0x10ad	-	0x300b	?	62	-
+    int TAG_COLOR_TEMPERATURE       = DATA_TYPE_WORD | 0x10ae; // 2	16-bit integer giving the color temperature - Subdir: 0x300b, Exif: 0xae
+    // 0x10af	-	0x300b	?	2	-
+    int TAG_COLOR_SPACE             = DATA_TYPE_WORD | 0x10b4; // 2	16-bit integer specifying the color space (1=sRGB, 2=Adobe RGB, 0xffff=uncalibrated) - Subdir: 0x300b, Exif: 0xb4
+    int TAG_RAW_JPEG_INFO           = DATA_TYPE_WORD | 0x10b5; // 10	Data block giving embedded JPG information - Subdir: 0x300b, Exif: 0xb5
+    // 0x10c0	0xc0	0x300b	?	26	-
+    // 0x10c1	0xc1	0x300b	?	26	-
+    // 0x10c2	-	0x300b	?	884	-
+
+    // LONG (4-Byte Alignment)
+//    int TAG_IMAGE_FORMAT = 0x1803; // 8	32-bit integer specifying image format (0x20001 for CRW), followed by 32-bit float giving target compression ratio - Subdir: 0x300a, Exif: -
+//    int TAG_RECORD_ID = 0x1804; // 4	The number of pictures taken since the camera was manufactured - Subdir: 0x300a, Exif: -
+    // 0x1805	-	0x3002	-	8	-
+//    int TAG_SELF_TIMER_TIME = 0x1806; // 4	32-bit integer giving self-timer time in milliseconds - Subdir: 0x3002, Exif: -
+//    int TAG_TARGET_DISTANCE_SETTING = 0x1807; // 4	32-bit float giving target distance in mm - Subdir: 0x3002, Exif: -
+//    int TAG_SERIAL_NUMBER = 0x180b; // 4	The camera body number for EOS models. eg) 00560012345 - Subdir: 0x3004, Exif: 0x0c
+    int TAG_TIME_STAMP              = DATA_TYPE_DWORD | 0x180e; // 12	32-bit integer giving the time in seconds when the picture was taken, followed by a 32-bit timezone in seconds - Subdir: 0x300a, Exif: -
+    int TAG_IMAGE_INFO              = DATA_TYPE_DWORD | 0x1810; // 28	Data block containing image information, including rotation - Subdir: 0x300a, Exif: -
+    // 0x1812	-	0x3004	-	40	-
+    int TAG_FLASH_INFO              = DATA_TYPE_DWORD | 0x1813; // 8	Two 32-bit floats: The flash guide number and the flash threshold - Subdir: 0x3002, Exif: -
+    int TAG_MEASURED_EV             = DATA_TYPE_DWORD | 0x1814; // 4	32-bit float giving the measured EV - Subdir: 0x3003, Exif: -
+    int TAG_FILE_NUMBER             = DATA_TYPE_DWORD | 0x1817; // 4	32-bit integer giving the number of this file. eg) 1181834 - Subdir: 0x300a, Exif: 0x08
+//    int TAG_EXPOSURE_INFO           = DATA_TYPE_DWORD | 0x1818; // 12	Three 32-bit floats: Exposure compensation, Tv, Av - Subdir: 0x3002, Exif: -
+    // 0x1819	-	0x300b	-	64	-
+    int TAG_CANON_MODEL_ID          = DATA_TYPE_DWORD | 0x1834; // 4	Unsigned 32-bit integer giving unique model ID - Subdir: 0x300b, Exif: 0x10
+    int TAG_DECODER_TABLE           = DATA_TYPE_DWORD | 0x1835; // 16	RAW decoder table information - Subdir: 0x300b, Exif: -
+    int TAG_SERIAL_NUMBER_FORMAT    = DATA_TYPE_DWORD | 0x183b; // 4	32-bit integer (0x90000000=format 1, 0xa0000000=format 2) - Subdir: 0x300b, Exif: 0x15
+
+    // UNDEFINED (Mixed Data Records)
+    int TAG_RAW_DATA            = DATA_TYPE_UNDEFINED | 0x2005; // The raw data itself (the bulk of the CRW file) - Subdir: root
+    int TAG_JPEG_PREVIEW        = DATA_TYPE_UNDEFINED | 0x2007; // The embedded JPEG image (2048x1360 pixels for the 300D with Canon firmware) - Subdir: root
+    int TAG_THUMBNAIL           = DATA_TYPE_UNDEFINED | 0x2008; // Thumbnail image (JPEG, 160x120 pixels) - Subdir: root
+
+    // SubDirectory Blocks
+    int TAG_IMAGE_DESCRIPTION       = DATA_TYPE_HEAP_1 | 0x2804; // The image description subdirectory - Subdir: 0x300a
+//    int TAG_CAMERA_OBJECT        = 0x2807; // The camera object subdirectory - Subdir: 0x300a
+//    int TAG_SHOOTING_RECORD      = 0x3002; // The shooting record subdirectory - Subdir: 0x300a
+//    int TAG_MEASURED_INFO        = 0x3003; // The measured information subdirectory - Subdir: 0x300a
+    int TAG_CAMERA_SPECIFICATION    = DATA_TYPE_HEAP_2 | 0x3004; // The camera specification subdirectory - Subdir: 0x2807
+
+    int TAG_IMAGE_PROPERTIES        = DATA_TYPE_HEAP_2 | 0x300a; // The main subdirectory containing all meta information - Subdir: root
+    int TAG_EXIF_INFORMATION        = DATA_TYPE_HEAP_2 | 0x300b; // The subdirectory containing most of the JPEG/TIFF Exif information - Subdir: 0x300a
+
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/ciff/CIFFDirectory.java

@@ -0,0 +1,30 @@
+package com.twelvemonkeys.imageio.plugins.crw.ciff;
+
+import java.util.Collection;
+
+import com.twelvemonkeys.imageio.metadata.AbstractDirectory;
+
+/**
+ * CIFFDirectory
+ */
+public final class CIFFDirectory extends AbstractDirectory {
+
+    CIFFDirectory(Collection<CIFFEntry> entries) {
+        super(entries);
+    }
+
+    @Override
+    public CIFFEntry getEntryById(Object identifier) {
+        return (CIFFEntry) super.getEntryById(identifier);
+    }
+
+    @Override
+    public CIFFEntry getEntryByFieldName(String fieldName) {
+        return (CIFFEntry) super.getEntryByFieldName(fieldName);
+    }
+
+    public CIFFDirectory getSubDirectory(int tagId) {
+        CIFFEntry entry = getEntryById(tagId);
+        return entry == null ? null : (CIFFDirectory) entry.getValue();
+    }
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/ciff/CIFFEntry.java

@@ -0,0 +1,115 @@
+package com.twelvemonkeys.imageio.plugins.crw.ciff;
+
+import java.lang.reflect.Field;
+
+import com.twelvemonkeys.imageio.metadata.AbstractEntry;
+import com.twelvemonkeys.lang.StringUtil;
+
+/**
+ * CIFFEntry
+ */
+public final class CIFFEntry extends AbstractEntry {
+
+    private final long offset;
+    private final long length;
+
+    /**
+     * Creates a CIFFEntry for "in-record" storage.
+     *
+     * @param identifier
+     * @param value
+     */
+    CIFFEntry(int identifier, Object value) {
+        super(identifier, value);
+        this.offset = -1;
+        this.length = -1;
+    }
+
+    /**
+     * Creates a CIFFEntry for "in-heap" storage.
+     *
+     * @param identifier
+     * @param value
+     */
+    CIFFEntry(int identifier, Object value, long offset, long length) {
+        super(identifier, value);
+        this.offset = offset;
+        this.length = length;
+    }
+
+    int tagId() {
+        return (int) getIdentifier();
+    }
+
+    boolean isHeapStorage() {
+        return offset != -1 && length != -1;
+    }
+
+    public long offset() {
+        return offset;
+    }
+
+    public long length() {
+        return length;
+    }
+
+    @Override
+    public String getFieldName() {
+        switch ((Integer) getIdentifier()) {
+            case CIFF.TAG_RAW_DATA:
+                return "RawData";
+            case CIFF.TAG_JPEG_PREVIEW:
+                return "JPEGPreview";
+            case CIFF.TAG_THUMBNAIL:
+                return "Thumbnail";
+            case CIFF.TAG_IMAGE_PROPERTIES:
+                return "ImageProperties";
+            case CIFF.TAG_EXIF_INFORMATION:
+                return "ExifInformation";
+            default:
+                Field[] fields = CIFF.class.getFields();
+
+                for (Field field : fields) {
+                    try {
+                        if (field.getType() == Integer.TYPE && field.getName().startsWith("TAG_")) {
+                            if (field.get(null).equals(getIdentifier())) {
+                                return StringUtil.lispToCamel(field.getName().substring(4).replace("_", "-").toLowerCase(), true);
+                            }
+                        }
+                    } catch (IllegalAccessException e) {
+                        // Should never happen, but in case, abort
+                        break;
+                    }
+                }
+
+                return null;
+        }
+    }
+
+    protected String getNativeIdentifier() {
+        return String.format("0x%04x", (Integer) getIdentifier());
+    }
+
+    @Override
+    public String getTypeName() {
+        int dataType = tagId() & 0x3800;
+
+        switch (dataType) {
+            case CIFF.DATA_TYPE_BYTE:
+                return "BYTE";
+            case CIFF.DATA_TYPE_ASCII:
+                return "ASCII";
+            case CIFF.DATA_TYPE_WORD:
+                return "SHORT";
+            case CIFF.DATA_TYPE_DWORD:
+                return "LONG";
+            case CIFF.DATA_TYPE_UNDEFINED:
+                return "UNDEFINED";
+            case CIFF.DATA_TYPE_HEAP_1:
+            case CIFF.DATA_TYPE_HEAP_2:
+                return super.getTypeName();
+            default:
+                throw new IllegalStateException(String.format("Unsupported data type: 0x%04x", dataType));
+        }
+    }
+}

imageio/imageio-crw/src/main/java/com/twelvemonkeys/imageio/plugins/crw/ciff/CIFFReader.java

@@ -0,0 +1,200 @@
+package com.twelvemonkeys.imageio.plugins.crw.ciff;
+
+import static java.util.Arrays.asList;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+import javax.imageio.IIOException;
+import javax.imageio.stream.ImageInputStream;
+
+import com.twelvemonkeys.imageio.metadata.MetadataReader;
+
+/**
+ * CIFFReader
+ */
+public final class CIFFReader extends MetadataReader {
+
+    @Override
+    public CIFFDirectory read(ImageInputStream input) throws IOException {
+        long start = readCIFFHeader(input);
+
+        // Spec: "No information regarding the length of the heap is given within the actual heap data structure itself"
+        return readHeap(input, start, input.length() - start); // TODO: If length is unknown, we'll have to search for it...
+    }
+
+    private int readCIFFHeader(ImageInputStream input) throws IOException {
+        byte[] bom = new byte[2];
+        input.readFully(bom);
+
+        // CIFF byte order mark II (Intel) or MM (Motorola), just like TIFF
+        if (bom[0] == 'I' && bom[1] == 'I') {
+            input.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+        }
+        else if (bom[0] == 'M' && bom[1] == 'M') {
+            input.setByteOrder(ByteOrder.BIG_ENDIAN);
+        }
+        else {
+            throw new IIOException("No CIFF byte order mark found, expected 'II' or 'MM'");
+        }
+
+        int size = input.readInt();
+        if (size != CIFF.HEADER_SIZE) {
+            // TODO: Other sizes?
+            throw new IIOException(String.format("Unexpected CIFF header size, expected %d: %d ", CIFF.HEADER_SIZE, size));
+        }
+
+        byte[] typeInfo = new byte[8];
+        input.readFully(typeInfo);
+
+        byte[] type = Arrays.copyOfRange(typeInfo, 0, 4);
+        if (!Arrays.equals(CIFF.TYPE_HEAP, type)) {
+            throw new IIOException(String.format("Unexpected CIFF type, expected 'HEAP': '%s'", new String(type, StandardCharsets.US_ASCII)));
+        }
+
+        byte[] subtype = Arrays.copyOfRange(typeInfo, 4, 8);
+        if (!(Arrays.equals(CIFF.SUBTYPE_ARCH, subtype) || Arrays.equals(CIFF.SUBTYPE_CCDR, subtype)
+              || Arrays.equals(CIFF.SUBTYPE_JPGM, subtype) ||Arrays.equals(CIFF.SUBTYPE_TIFP, subtype))) {
+            throw new IIOException(String.format("Unsupported CIFF subtype, expected 'ARCH', 'CCDR', 'JPGM' or 'TIFP': '%s'",
+                                                 new String(subtype, StandardCharsets.US_ASCII)));
+        }
+
+        // Version 1.2
+        long version = input.readUnsignedInt();
+        if (version != CIFF.VERSION_1_2) {
+            throw new IIOException(String.format("Unsupported CIFF version, expected 1.2: %d.%d", version >> 16, version & 0xffff));
+        }
+
+        return size;
+    }
+
+    private CIFFDirectory readHeap(ImageInputStream input, long heapOffset, long heapLength) throws IOException {
+        input.seek(heapOffset + heapLength - 4);
+        long offsetTableOffset = input.readUnsignedInt();
+
+        return readOffsetTable(input, heapOffset, offsetTableOffset + heapOffset);
+    }
+
+    private CIFFDirectory readOffsetTable(ImageInputStream input, long heapOffset, long tableOffset) throws IOException {
+        input.seek(tableOffset);
+
+        // DC_UINT16 numRecords;/* the number tblArray elements */
+        // DC_RECORD_ENTRY tblArray[1];/* Array of the record entries */
+        int count = input.readUnsignedShort(); // 0 entries is allowed
+        CIFFEntry[] entries = new CIFFEntry[count];
+
+        // TYPECODE typeCode;/* type code of the record */
+        // DC_UINT32 length;/* record length */
+        // DC_UINT32 offset;/* offset of the record in the heap*/
+        for (int i = 0; i < count; i++) {
+            short typeCode = input.readShort();
+
+            long entryLength = input.readUnsignedInt();
+            long entryOffset = input.readUnsignedInt();
+
+            int recordType = typeCode & 0xc000;
+            int dataType = typeCode & 0x3800;
+            int idCode = typeCode & 0x7ff;
+
+            // typeIdCode = dataType + idCode
+            int typeIdCode = typeCode & 0x3fff;
+
+
+            if (recordType == CIFF.STORAGE_RECORD) {
+                Object value = null;
+                // TODO: Even for these records, we need to know the data structure for each tag... :-P
+                switch (dataType) {
+                    case CIFF.DATA_TYPE_BYTE:
+                        value = (byte) entryLength & 0xff;
+                        break;
+                    case CIFF.DATA_TYPE_ASCII:
+                        ByteBuffer buffer = ByteBuffer.allocate(8);
+                        buffer.putInt((int) entryLength);
+                        buffer.putInt((int) entryOffset);
+
+                        value = toNullTerminatedStrings(buffer.array());
+                        break;
+                    case CIFF.DATA_TYPE_WORD:
+                        value = (short) entryLength & 0xffff;
+                        break;
+                    case CIFF.DATA_TYPE_DWORD:
+                        value = (int) entryLength;
+                        break;
+                    case CIFF.DATA_TYPE_UNDEFINED:
+                        value = entryLength << 32L | entryOffset;
+                        break;
+                }
+
+                entries[i] = new CIFFEntry(typeIdCode, value);
+            }
+            else {
+                entries[i] = new CIFFEntry(typeIdCode, new long[] {heapOffset + entryOffset, entryLength}, heapOffset + entryOffset, entryLength);
+            }
+        }
+
+        // Fill inn sub entries
+        input.mark();
+        try {
+            for (int i = 0; i < count; i++) {
+                CIFFEntry entry = entries[i];
+                int dataType = entry.tagId() & 0x3800;
+
+                Object value;
+                if (entry.isHeapStorage()) {
+                    switch (dataType) {
+                        case CIFF.DATA_TYPE_HEAP_1:
+                        case CIFF.DATA_TYPE_HEAP_2:
+                            value = readHeap(input, entry.offset(), entry.length());
+                            break;
+
+                        case CIFF.DATA_TYPE_BYTE:
+                        case CIFF.DATA_TYPE_UNDEFINED:
+                        case CIFF.DATA_TYPE_ASCII:
+                            byte[] bytes = new byte[(int) entry.length()];
+                            input.seek(entry.offset());
+                            input.readFully(bytes);
+                            value = dataType == CIFF.DATA_TYPE_ASCII ? toNullTerminatedStrings(bytes) : bytes;
+                            break;
+
+                        case CIFF.DATA_TYPE_WORD:
+                            short[] shorts = new short[(int) (entry.length() / 2)];
+                            input.seek(entry.offset());
+                            input.readFully(shorts, 0, shorts.length);
+                            value = shorts;
+                            break;
+
+                        case CIFF.DATA_TYPE_DWORD:
+                            int[] ints = new int[(int) (entry.length() / 4)];
+                            input.seek(entry.offset());
+                            input.readFully(ints, 0, ints.length);
+                            value = ints;
+                            break;
+
+                        default:
+                            throw new IIOException(String.format("Unsupported data type: 0x%04x", dataType));
+                    }
+
+                    entries[i] = new CIFFEntry(entry.tagId(), value, entry.offset(), entry.length());
+                }
+            }
+        }
+        finally {
+            input.reset();
+        }
+
+        return new CIFFDirectory(asList(entries));
+    }
+
+    private String[] toNullTerminatedStrings(byte[] buffer) {
+        int len = buffer.length;
+
+        while (len > 0 && buffer[len - 1] == 0) {
+            len--;
+        }
+
+        return new String(buffer, 0, len, StandardCharsets.US_ASCII).split("\u0000");
+    }
+}

imageio/imageio-crw/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi

@@ -0,0 +1 @@
+com.twelvemonkeys.imageio.plugins.crw.CRWImageReaderSpi

imageio/imageio-crw/src/test/java/com/twelvemonkeys/imageio/plugins/crw/CRWImageReaderTest.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.crw;
+
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import javax.imageio.ImageReader;
+import javax.imageio.spi.ImageReaderSpi;
+import java.awt.*;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * CRWImageReaderTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CRWImageReaderTest.java,v 1.0 07.04.14 21:52 haraldk Exp$
+ */
+@Ignore
+public class CRWImageReaderTest extends ImageReaderAbstractTest<CRWImageReader> {
+    @Override
+    protected List<TestData> getTestData() {
+        return Arrays.asList(
+                new TestData(getClassLoaderResource("/crw/RAW_CANON_G1.CRW"), new Dimension(640, 480)),    // Canon G1
+                new TestData(getClassLoaderResource("/crw/RAW_CANON_300D.CRW"), new Dimension(3888, 2592)) // Canon EOS 300D
+        );
+    }
+
+    @Override
+    protected ImageReaderSpi createProvider() {
+        return new CRWImageReaderSpi();
+    }
+
+    @Override
+    protected List<String> getFormatNames() {
+        return Arrays.asList("crw");
+    }
+
+    @Override
+    protected List<String> getSuffixes() {
+        return Arrays.asList("crw");
+    }
+
+    @Override
+    protected List<String> getMIMETypes() {
+        return Arrays.asList("image/x-canon-raw");
+    }
+
+    @Test
+    @Ignore("Known issue: Subsampled reading not supported")
+    @Override
+    public void testReadWithSubsampleParamPixels() throws IOException {
+        super.testReadWithSubsampleParamPixels();
+    }
+
+    @Test
+    @Ignore("Known issue: Source region reading not supported")
+    @Override
+    public void testReadWithSourceRegionParamEqualImage() throws IOException {
+        super.testReadWithSourceRegionParamEqualImage();
+    }
+}

imageio/imageio-dng/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2014, Harald Kuhr
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without
+  ~ modification, are permitted provided that the following conditions are met:
+  ~     * Redistributions of source code must retain the above copyright
+  ~       notice, this list of conditions and the following disclaimer.
+  ~     * Redistributions in binary form must reproduce the above copyright
+  ~       notice, this list of conditions and the following disclaimer in the
+  ~       documentation and/or other materials provided with the distribution.
+  ~     * Neither the name "TwelveMonkeys" nor the
+  ~       names of its contributors may be used to endorse or promote products
+  ~       derived from this software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  ~ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  ~ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  ~ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  ~ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  ~ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>imageio</artifactId>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <version>3.8.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>imageio-dng</artifactId>
+    <name>TwelveMonkeys :: ImageIO :: DNG plugin</name>
+    <description>ImageIO plugin for Adobe Digital Negative and TIFF/EP (DNG).</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-metadata</artifactId>
+        </dependency>
+        <dependency>
+            <version>${project.version}</version>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-jpeg</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNG.java

@@ -0,0 +1,127 @@
+package com.twelvemonkeys.imageio.plugins.dng;
+
+/**
+ * DNG
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: DNG.java,v 1.0 03.10.14 10:49 haraldk Exp$
+ */
+interface DNG {
+    // TODO: Some (all?) of these tags are defined by TIFF/EP, should we reflect that in package/class names?
+
+    /** CFA (Color Filter Array). */
+    int PHOTOMETRIC_CFA = 32803;
+    /** LinearRaw. */
+    int PHOTOMETRIC_LINEAR_RAW = 34892;
+
+    /**
+     * Lossy JPEG.
+     * <p/>
+     * Lossy JPEG (34892) is allowed for IFDs that use PhotometricInterpretation = 34892
+     * (LinearRaw) and 8-bit integer data. This new compression code is required to let the DNG
+     * reader know to use a lossy JPEG decoder rather than a lossless JPEG decoder for this
+     * combination of PhotometricInterpretation and BitsPerSample.
+     */
+    int COMPRESSION_LOSSY_JPEG = 34892;
+
+    /**
+     * CFARepeatPatternDim
+     * <p/>
+     * This tag encodes the number of pixels horizontally and vertically that are needed to uniquely define the repeat
+     * pattern of the color filter array (CFA) pattern used in the color image sensor. It is mandatory when
+     * PhotometricInterpretation = 32803, and there are no defaults allowed. It is optional when
+     * PhotometricInterpretation = 2 or 6 and SensingMethod = 2, where it can be used to indicate the original sensor
+     * sampling positions.
+     */
+    int TAG_CFA_REPEAT_PATTERN_DIM = 33421;
+    /**
+     * Indicates the color filter array (CFA) geometric pattern of the image sensor
+     * when a one-chip color area sensor is used.
+     * NOTE: This tag (defined in TIFF/EP) is different from the CFAPattern defined in normal TIFF.
+     */
+    int TAG_CFA_PATTERN = 33422;
+
+    /** Indicates the image sensor type on the camera or input device. */
+    int TAG_SENSING_METHOD = 37399;
+
+    // From http://www.awaresystems.be/imaging/tiff/tifftags/privateifd/exif/cfapattern.html
+    byte CFA_PATTERN_RED = 0;
+    byte CFA_PATTERN_GREEN = 1;
+    byte CFA_PATTERN_BLUE = 2;
+    byte CFA_PATTERN_CYAN = 3;
+    byte CFA_PATTERN_MAGENTA = 4;
+    byte CFA_PATTERN_YELLOW = 5;
+    byte CFA_PATTERN_WHITE = 6; // ???? Should be KEY?
+
+    /**
+     * This tag encodes the DNG four-tier version number. For files compliant with this version of
+     * the DNG specification (1.4.0.0), this tag should contain the bytes: 1, 4, 0, 0.
+     */
+    int TAG_DNG_VERSION = 50706;
+    int TAG_DNG_BACKWARD_VERSION = 50707;
+
+    /** UniqueCameraModel defines a unique, non-localized name for the camera model that created the image in the raw file. */
+    int TAG_UNIQUE_CAMERA_MODEL = 50708;
+    int TAG_LOCALIZED_CAMERA_MODEL = 50709;
+
+    /** CFA plane to RGB mapping (default: [0, 1, 2]). */
+    int TAG_CFA_PLANE_COLOR = 50710;
+    /** CFA spatial layout (default: 1). */
+    int TAG_CFA_LAYOUT = 50711;
+
+    /** 1 = Rectangular (or square) layout. */
+    int CFA_LAYOUT_RECTANGULAR = 1;
+    /** 2 = Staggered layout A: even columns are offset down by 1/2 row. */
+    int CFA_LAYOUT_STAGGERED_A = 2;
+    /** 3 = Staggered layout B: even columns are offset up by 1/2 row. */
+    int CFA_LAYOUT_STAGGERED_B = 3;
+    /** 4 = Staggered layout C: even rows are offset right by 1/2 column. */
+    int CFA_LAYOUT_STAGGERED_C = 4;
+    /** 5 = Staggered layout D: even rows are offset left by 1/2 column. */
+    int CFA_LAYOUT_STAGGERED_D = 5;
+    /** 6 = Staggered layout E: even rows are offset up by 1/2 row, even columns are offset left by 1/2 column. */
+    int CFA_LAYOUT_STAGGERED_E = 6;
+    /** 7 = Staggered layout F: even rows are offset up by 1/2 row, even columns are offset right by 1/2 column. */
+    int CFA_LAYOUT_STAGGERED_F = 7;
+    /** 8 = Staggered layout G: even rows are offset down by 1/2 row, even columns are offset left by 1/2 column. */
+    int CFA_LAYOUT_STAGGERED_G = 8;
+    /** 9 = Staggered layout H: even rows are offset down by 1/2 row, even columns are offset right by 1/2 column. */
+    int CFA_LAYOUT_STAGGERED_H = 9;
+
+    /** LinearizationTable describes a lookup table that maps stored values into linear values. */
+    int TAG_LINEARIZATION_TABLE = 50712;
+
+    /** This tag specifies repeat pattern size for the BlackLevel tag. Default: [1, 1]. */
+    int TAG_BLACK_LEVEL_REPEAT_DIM = 50713;
+
+    /**
+     * This tag specifies the zero light (a.k.a. thermal black or black current) encoding level,
+     * as a repeating pattern. Default: 0.
+     */
+    int TAG_BLACK_LEVEL = 50714;
+
+    // TODO: Rest of DNG tags.
+    // ...
+
+    /**
+     * Horizontal Difference X2.
+     * Same as Horizontal Difference except the pixel two to the left is used rather than the pixel one to the left.
+     */
+    int PREDICTOR_HORIZONTAL_X2 = 34892;
+    /**
+     * Horizontal Difference X4.
+     * Same as Horizontal Difference except the pixel four to the left is used rather than the pixel one to the left.
+     */
+    int PREDICTOR_HORIZONTAL_X4 = 34893;
+    /**
+     * Floating Point X2.
+     * Same as Floating Point except the pixel two to the left is used rather than the pixel one to the left.
+     */
+    int PREDICTOR_FLOATINGPOINT_X2 = 34894;
+    /**
+     * Floating Point X4.
+     * Same as Floating Point except the pixel four to the left is used rather than the pixel one to the left
+     */
+    int PREDICTOR_FLOATINGPOINT_X4 = 34895;
+}

imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderSpi.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.dng;
+
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
+
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.Locale;
+
+/**
+ * CR2ImageReaderSpi
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CR2ImageReaderSpi.java,v 1.0 07.04.14 21:26 haraldk Exp$
+ */
+public final class DNGImageReaderSpi extends ImageReaderSpiBase {
+    public DNGImageReaderSpi() {
+        super(new DNGProviderInfo());
+    }
+
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        if (!(pSource instanceof ImageInputStream)) {
+            return false;
+        }
+
+        ImageInputStream stream = (ImageInputStream) pSource;
+
+        stream.mark();
+        try {
+            byte[] bom = new byte[2];
+            stream.readFully(bom);
+
+            ByteOrder originalOrder = stream.getByteOrder();
+
+            try {
+                if (bom[0] == 'I' && bom[1] == 'I') {
+                    stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+                }
+                else if (bom[0] == 'M' && bom[1] == 'M') {
+                    stream.setByteOrder(ByteOrder.BIG_ENDIAN);
+                }
+                else  {
+                    return false;
+                }
+
+                int tiffMagic = stream.readUnsignedShort();
+                if (tiffMagic != TIFF.TIFF_MAGIC) {
+                    return false;
+                }
+
+                // TODO: This is not different from a normal TIFF...
+
+                return true;
+            }
+            finally {
+                stream.setByteOrder(originalOrder);
+            }
+        }
+        finally {
+            stream.reset();
+        }
+    }
+
+    @Override
+    public ImageReader createReaderInstance(Object extension) throws IOException {
+        return new DNGImageReader(this);
+    }
+
+    @Override
+    public String getDescription(Locale locale) {
+        return "Adobe Digital Negative (DNG) format Reader";
+    }
+}

imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGProviderInfo.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2018, Oleg Ermolaev
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.dng;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * @author Oleg Ermolaev Date: 04.05.2018 1:50
+ */
+class DNGProviderInfo extends ReaderWriterProviderInfo {
+    protected DNGProviderInfo() {
+        super(
+                DNGProviderInfo.class,
+                new String[]{"dng", "NDG"},
+                new String[]{"dng"},
+                new String[]{
+                        "image/x-adobe-dng",               // TODO: Look up
+                },
+                "com.twelvemonkeys.imageio.plugins.dng.DNGImageReader",
+                new String[]{"com.twelvemonkeys.imageio.plugins.dng.DNGImageReaderSpi"},
+                null,
+                null,
+                true,
+                null,
+                null,
+                null,
+                null,
+                true,
+                null,
+                null,
+                null,
+                null
+        );
+    }
+}

imageio/imageio-dng/src/test/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderTest.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.dng;
+
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import javax.imageio.ImageReader;
+import javax.imageio.spi.ImageReaderSpi;
+import java.awt.*;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * CR2ImageReaderTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CR2ImageReaderTest.java,v 1.0 07.04.14 21:52 haraldk Exp$
+ */
+@Ignore
+public class DNGImageReaderTest extends ImageReaderAbstractTest<DNGImageReader> {
+    @Override
+    protected List<TestData> getTestData() {
+        return Arrays.asList(
+                new TestData(getClassLoaderResource("/dng/L1004220.DNG"),
+                        // Uncompressed RGB (thumbnail), Ucompressed CFA
+//                        new Dimension(320, 216),
+                        new Dimension(5216, 3472)),
+                new TestData(getClassLoaderResource("/dng/IMG_2224.dng"),
+                        // Uncompressed RGB (thumbnail), JPEG Lossless CFA, JPEG DCT YCbCr
+//                        new Dimension(256, 171),
+                        new Dimension(3516, 2328),
+                        new Dimension(1024, 683))
+//                new TestData(getClassLoaderResource("/dng/test.dng"), new Dimension(2, 2)) // Only JPEG Lossless CFA
+        );
+    }
+
+    @Override
+    protected ImageReaderSpi createProvider() {
+        return new DNGImageReaderSpi();
+    }
+
+    @Override
+    protected List<String> getFormatNames() {
+        return Arrays.asList("dng");
+    }
+
+    @Override
+    protected List<String> getSuffixes() {
+        return Arrays.asList("dng");
+    }
+
+    @Override
+    protected List<String> getMIMETypes() {
+        return Arrays.asList("image/x-dng");
+    }
+
+    @Test
+    @Ignore("Known issue: Subsampled reading not supported")
+    @Override
+    public void testReadWithSubsampleParamPixels() throws IOException {
+        super.testReadWithSubsampleParamPixels();
+    }
+
+    @Test
+    @Ignore("Known issue: Source region reading not supported")
+    @Override
+    public void testReadWithSourceRegionParamEqualImage() throws IOException {
+        super.testReadWithSourceRegionParamEqualImage();
+    }
+}

imageio/imageio-hdr/src/test/java/com/twelvemonkeys/imageio/plugins/hdr/HDRImageReaderTest.java

@@ -38,14 +38,12 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static java.util.Collections.emptyList;
-
 /**
- * HDRImageReaderTest
+ * TGAImageReaderTest
  *
  * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @author last modified by $Author: haraldk$
- * @version $Id: HDRImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$
+ * @version $Id: TGAImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$
  */
 public class HDRImageReaderTest extends ImageReaderAbstractTest<HDRImageReader> {
     @Override
@@ -60,12 +58,6 @@ public class HDRImageReaderTest extends ImageReaderAbstractTest<HDRImageReader>
         );
     }
 
-    @Override
-    protected List<TestData> getTestDataForAffineTransformOpCompatibility() {
-        // HDR images uses floating point buffers...
-        return emptyList();
-    }
-
     @Override
     protected List<String> getFormatNames() {
         return Arrays.asList("HDR", "hdr", "RGBE", "rgbe");

imageio/imageio-jpeg-jai-interop/pom.xml

@@ -13,7 +13,7 @@
     </description>
 
     <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg.jaiinterop</project.jpms.module.name>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jaiinterop</project.jpms.module.name>
     </properties>
 
     <build>
@@ -33,7 +33,6 @@
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-core</artifactId>
             <version>1.4.0</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>

imageio/imageio-jpeg-jep262-interop/pom.xml

@@ -13,7 +13,7 @@
     </description>
 
     <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg.jep262interop</project.jpms.module.name>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jep262interop</project.jpms.module.name>
     </properties>
 
     <build>

imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnail.java

@@ -119,7 +119,7 @@ final class EXIFThumbnail {
                     case 6:
                         // YCbCr
                         for (int i = 0; i < thumbLength; i += 3) {
-                            YCbCrConverter.convertJPEGYCbCr2RGB(thumbData, thumbData, i);
+                            YCbCrConverter.convertYCbCr2RGB(thumbData, thumbData, i);
                         }
                         break;
                     default:

imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java

@@ -123,7 +123,7 @@ public final class JPEGImageReader extends ImageReaderBase {
     private int currentStreamIndex = 0;
     private final List<Long> streamOffsets = new ArrayList<>();
 
-    JPEGImageReader(final ImageReaderSpi provider, final ImageReader delegate) {
+    protected JPEGImageReader(final ImageReaderSpi provider, final ImageReader delegate) {
         super(provider);
 
         this.delegate = Validate.notNull(delegate);
@@ -1169,7 +1169,7 @@ public final class JPEGImageReader extends ImageReaderBase {
         processThumbnailStarted(imageIndex, thumbnailIndex);
         processThumbnailProgress(0f);
 
-        BufferedImage thumbnail = thumbnails.get(thumbnailIndex).read();
+        BufferedImage thumbnail = thumbnails.get(thumbnailIndex).read();;
 
         processThumbnailProgress(100f);
         processThumbnailComplete();
@@ -1211,7 +1211,7 @@ public final class JPEGImageReader extends ImageReaderBase {
 
         for (int y = 0; y < height; y++) {
             for (int x = 0; x < width; x++) {
-                YCbCrConverter.convertJPEGYCbCr2RGB(data, data, (x + y * width) * numComponents);
+                YCbCrConverter.convertYCbCr2RGB(data, data, (x + y * width) * numComponents);
             }
         }
     }
@@ -1225,7 +1225,7 @@ public final class JPEGImageReader extends ImageReaderBase {
             for (int x = 0; x < width; x++) {
                 int offset = (x + y * width) * 4;
                 // YCC -> CMY
-                YCbCrConverter.convertJPEGYCbCr2RGB(data, data, offset);
+                YCbCrConverter.convertYCbCr2RGB(data, data, offset);
                 // Inverse K
                 data[offset + 3] = (byte) (0xff - data[offset + 3] & 0xff);
             }

imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGLosslessDecoderWrapper.java

@@ -86,6 +86,22 @@ final class JPEGLosslessDecoderWrapper {
         int width = decoder.getDimX();
         int height = decoder.getDimY();
 
+        if (SliceContext.isPresent()) { //QnD
+            final int[][] unsliced = new int[1][];
+            final int componentCount = decoder.getNumComponents();
+            final Slice slice = SliceContext.get();
+            unsliced[0] = slice.unslice(decoded, componentCount, height);
+            switch (decoder.getPrecision()) {
+                case 8:
+                    return to8Bit1ComponentGrayScale(unsliced, width * componentCount, height);
+                case 10:
+                case 12:
+                case 14:
+                case 16:
+                    return to16Bit1ComponentGrayScale(unsliced, decoder.getPrecision(), width * componentCount, height);
+            }
+        }
+
         // Single component, assumed to be Gray
         if (decoder.getNumComponents() == 1) {
             switch (decoder.getPrecision()) {

imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/Slice.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2018, Oleg Ermolaev
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.jpeg;
+
+import javax.imageio.IIOException;
+import java.util.Arrays;
+
+/**
+ * For CR2 RAW image.
+ *
+ * @author Oleg Ermolaev Date: 05.05.2018 2:04
+ */
+public class Slice {
+    public static final int FIRST_WIDTH_COUNT_INDEX = 0;
+    public static final int FIRST_WIDTH_INDEX = 1;
+    public static final int LAST_WIDTH_INDEX = 2;
+
+    private final int firstWidthCount;
+    private final int firstWidth;
+    private final int lastWidth;
+
+    public Slice(int firstWidthCount, int firstWidth, int lastWidth) {
+        this.firstWidthCount = firstWidthCount;
+        this.firstWidth = firstWidth;
+        this.lastWidth = lastWidth;
+    }
+
+    public static Slice createSlice(long[] values) throws IIOException {
+        if (values == null || values.length != 3) {
+            throw new IIOException("Unexpected slices array: " + Arrays.toString(values));
+        }
+        final long firstWidthCount = values[FIRST_WIDTH_COUNT_INDEX];
+        final long firstWidth = values[FIRST_WIDTH_INDEX];
+        final long lastWidth = values[LAST_WIDTH_INDEX];
+        if (!(0 < firstWidthCount && firstWidthCount <= Integer.MAX_VALUE) ||
+                !(0 < firstWidth && firstWidth <= Integer.MAX_VALUE) ||
+                !(0 < lastWidth && lastWidth <= Integer.MAX_VALUE) ||
+                firstWidthCount * firstWidth + lastWidth > Integer.MAX_VALUE) {
+            throw new IIOException("Unexpected slices array: " + Arrays.toString(values));
+        }
+        return new Slice((int) firstWidthCount, (int) firstWidth, (int) lastWidth);
+    }
+
+    public int getFirstWidthCount() {
+        return firstWidthCount;
+    }
+
+    public int getFirstWidth() {
+        return firstWidth;
+    }
+
+    public int getLastWidth() {
+        return lastWidth;
+    }
+
+    private int getWidth() {
+        return firstWidthCount * firstWidth + lastWidth;
+    }
+
+    public int[] unslice(int[][] data, int componentCount, int height) throws IIOException {
+        final int width = getWidth();
+        final int[] result = new int[width * height];
+
+        for (int componentIndex = 0; componentIndex < componentCount; componentIndex++) {
+            if (result.length != data[componentIndex].length * componentCount) {
+                throw new IIOException(String.format("Invalid array size for component #%d", componentIndex));
+            }
+        }
+
+        int position = 0;
+        int currentWidth = firstWidth / componentCount;
+        for (int sliceIndex = 0; sliceIndex < firstWidthCount + 1; ++sliceIndex) {
+            if (sliceIndex == firstWidthCount) {
+                currentWidth = lastWidth / componentCount;
+            }
+            final int sliceOffset = sliceIndex * firstWidth;
+            for (int y = 0; y < height; ++y) {
+                final int yOffset = y * width;
+                for (int x = 0; x < currentWidth; ++x) {
+                    final int xOffset = x * componentCount;
+                    for (int componentIndex = 0; componentIndex < componentCount; componentIndex++) {
+                        result[sliceOffset + yOffset + xOffset + componentIndex] = data[componentIndex][position];
+                    }
+                    position++;
+                }
+            }
+        }
+
+        return result;
+    }
+}

imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/SliceContext.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2018, Oleg Ermolaev
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.jpeg;
+
+/**
+ * QnD
+ *
+ * @author Oleg Ermolaev Date: 05.05.2018 2:13
+ */
+public class SliceContext {
+    private static final ThreadLocal<Slice> CONTEXT = new ThreadLocal<>();
+
+    public static boolean isPresent() {
+        return get() != null;
+    }
+
+    public static Slice get() {
+        return CONTEXT.get();
+    }
+
+    public static void set(Slice slice) {
+        CONTEXT.set(slice);
+    }
+
+    public static void remove() {
+        CONTEXT.remove();
+    }
+}

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

@@ -36,6 +36,7 @@ import com.twelvemonkeys.lang.StringUtil;
 
 import org.hamcrest.core.IsInstanceOf;
 import org.junit.Test;
+import org.mockito.internal.matchers.GreaterThan;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -65,11 +66,12 @@ import static com.twelvemonkeys.imageio.util.IIOUtil.lookupProviderByName;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeNoException;
 import static org.junit.Assume.assumeNotNull;
 import static org.mockito.AdditionalMatchers.and;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 /**
@@ -1454,7 +1456,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
                     assertTrue(markerSequences.getLength() == 1 || markerSequences.getLength() == 2); // In case of JPEG encoded thumbnail, there will be 2
                     IIOMetadataNode markerSequence = (IIOMetadataNode) markerSequences.item(markerSequences.getLength() - 1); // The last will be the "main" image
                     assertNotNull(markerSequence);
-                    assertThat(markerSequence.getChildNodes().getLength(), greaterThan(0));
+                    assertThat(markerSequence.getChildNodes().getLength(), new GreaterThan<>(0));
 
                     NodeList unknowns = markerSequence.getElementsByTagName("unknown");
                     for (int j = 0; j < unknowns.getLength(); j++) {

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

@@ -36,6 +36,7 @@ import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegmentUtil;
 import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
 
 import org.junit.Test;
+import org.mockito.internal.matchers.LessOrEqual;
 
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
@@ -47,7 +48,6 @@ import java.net.URL;
 import java.util.List;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
@@ -124,7 +124,7 @@ public class JPEGSegmentImageInputStreamTest {
             length++;
         }
 
-        assertThat(length, lessThanOrEqualTo(10203L)); // In no case should length increase
+        assertThat(length, new LessOrEqual<>(10203L)); // In no case should length increase
 
         assertEquals(9607L, length); // May change, if more chunks are passed to reader...
     }

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java

@@ -46,7 +46,6 @@ import java.io.IOException;
  *
  * @deprecated Use com.twelvemonkeys.imageio.metadata.tiff.TIFFReader instead.
  */
-@Deprecated
 public final class EXIFReader extends MetadataReader {
 
     private final TIFFReader delegate = new TIFFReader();

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFWriter.java

@@ -48,7 +48,6 @@ import java.util.Collection;
  *
  * @deprecated Use com.twelvemonkeys.imageio.metadata.tiff.TIFFWriter instead.
  */
-@Deprecated
 public final class EXIFWriter extends MetadataWriter {
 
     private final TIFFWriter delegate = new TIFFWriter();

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/Rational.java

@@ -41,7 +41,6 @@ package com.twelvemonkeys.imageio.metadata.exif;
  *
  * @deprecated Use com.twelvemonkeys.imageio.metadata.tiff.Rational instead.
  */
-@Deprecated
 public final class Rational extends Number implements Comparable<Rational> {
     private final com.twelvemonkeys.imageio.metadata.tiff.Rational delegate;
 

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java

@@ -39,6 +39,5 @@ package com.twelvemonkeys.imageio.metadata.exif;
  *
  * @deprecated Use com.twelvemonkeys.imageio.metadata.tiff.TIFF instead.
  */
-@Deprecated
 public interface TIFF extends com.twelvemonkeys.imageio.metadata.tiff.TIFF {
 }

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/tiff/TIFFReader.java

@@ -30,15 +30,8 @@
 
 package com.twelvemonkeys.imageio.metadata.tiff;
 
-import com.twelvemonkeys.imageio.metadata.Directory;
-import com.twelvemonkeys.imageio.metadata.Entry;
-import com.twelvemonkeys.imageio.metadata.MetadataReader;
-import com.twelvemonkeys.lang.StringUtil;
-import com.twelvemonkeys.lang.Validate;
+import static com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry.getValueLength;
 
-import javax.imageio.IIOException;
-import javax.imageio.ImageIO;
-import javax.imageio.stream.ImageInputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
@@ -46,7 +39,15 @@ import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
-import static com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry.getValueLength;
+import javax.imageio.IIOException;
+import javax.imageio.ImageIO;
+import javax.imageio.stream.ImageInputStream;
+
+import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.MetadataReader;
+import com.twelvemonkeys.lang.StringUtil;
+import com.twelvemonkeys.lang.Validate;
 
 /**
  * TIFFReader
@@ -72,17 +73,16 @@ public final class TIFFReader extends MetadataReader {
             }
         };
 
-        map.put(TIFF.TAG_SUB_IFD, Collections.singleton(TIFF.TAG_SUB_IFD));
-        map.put(TIFF.TAG_EXIF_IFD, Collections.singleton(TIFF.TAG_INTEROP_IFD));
+        map.put(TIFF.TAG_SUB_IFD, Collections.unmodifiableCollection(Collections.singleton(TIFF.TAG_SUB_IFD)));
+        map.put(TIFF.TAG_EXIF_IFD, Collections.unmodifiableCollection(Collections.singleton(TIFF.TAG_INTEROP_IFD)));
 
         return Collections.unmodifiableMap(map);
     }
 
-    private final Set<Long> parsedIFDs = new TreeSet<>();
-
     private long length;
     private boolean longOffsets;
     private int offsetSize;
+    private Set<Long> parsedIFDs = new TreeSet<>();
 
     @Override
     public Directory read(final ImageInputStream input) throws IOException {

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/tiff/TIFFWriter.java

@@ -40,6 +40,7 @@ import javax.imageio.IIOException;
 import javax.imageio.stream.ImageOutputStream;
 import java.io.IOException;
 import java.nio.ByteOrder;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
@@ -57,24 +58,7 @@ public final class TIFFWriter extends MetadataWriter {
 
     private static final int WORD_LENGTH = 2;
     private static final int LONGWORD_LENGTH = 4;
-
-    // TODO: We probably want to gloss over client code writing IFDs in BigTIFF (or vice versa) somehow... Silently convert IFD -> IFD8
-    private final boolean longOffsets;
-    private final int offsetSize;
-    private final long entryLength;
-    private final int directoryCountLength;
-
-    public TIFFWriter() {
-        this(LONGWORD_LENGTH);
-    }
-
-    public TIFFWriter(int offsetSize) {
-        this.offsetSize = Validate.isTrue(offsetSize == 4 || offsetSize == 8, offsetSize, "offsetSize must be 4 for TIFF or 8 for BigTIFF");
-
-        longOffsets = offsetSize == 8;
-        directoryCountLength = longOffsets ? 8 : WORD_LENGTH;
-        entryLength = 2 * WORD_LENGTH + 2 * offsetSize;
-    }
+    private static final int ENTRY_LENGTH = 12;
 
     public boolean write(final Collection<? extends Entry> entries, final ImageOutputStream stream) throws IOException {
         return write(new IFD(entries), stream);
@@ -103,7 +87,7 @@ public final class TIFFWriter extends MetadataWriter {
         }
 
         // Offset to next IFD (EOF)
-        writeOffset(stream, 0);
+        stream.writeInt(0);
 
         return true;
     }
@@ -112,12 +96,7 @@ public final class TIFFWriter extends MetadataWriter {
         // Header
         ByteOrder byteOrder = stream.getByteOrder();
         stream.writeShort(byteOrder == ByteOrder.BIG_ENDIAN ? TIFF.BYTE_ORDER_MARK_BIG_ENDIAN : TIFF.BYTE_ORDER_MARK_LITTLE_ENDIAN);
-        stream.writeShort(longOffsets ? TIFF.BIGTIFF_MAGIC : TIFF.TIFF_MAGIC);
-
-        if (longOffsets) {
-            stream.writeShort(offsetSize); // Always 8 in this case
-            stream.writeShort(0);
-        }
+        stream.writeShort(42);
     }
 
     public long writeIFD(final Collection<Entry> entries, final ImageOutputStream stream) throws IOException {
@@ -139,42 +118,37 @@ public final class TIFFWriter extends MetadataWriter {
         long dataSize = computeDataSize(ordered);
 
         // Offset to this IFD
-        final long ifdOffset = stream.getStreamPosition() + dataSize + offsetSize;
+        final long ifdOffset = stream.getStreamPosition() + dataSize + LONGWORD_LENGTH;
 
         if (!isSubIFD) {
-            writeOffset(stream, ifdOffset);
-            dataOffset += offsetSize;
+            stream.writeInt(assertIntegerOffset(ifdOffset));
+            dataOffset += LONGWORD_LENGTH;
 
             // Seek to offset
             stream.seek(ifdOffset);
         }
         else {
-            dataOffset += directoryCountLength + ordered.size() * entryLength;
+            dataOffset += WORD_LENGTH + ordered.size() * ENTRY_LENGTH;
         }
 
         // Write directory
-        writeDirectoryCount(stream, ordered.size());
+        stream.writeShort(ordered.size());
 
         for (Entry entry : ordered) {
-            // Write tag id, type & value count
+            // Write tag id
             stream.writeShort((Integer) entry.getIdentifier());
+            // Write tag type
             stream.writeShort(getType(entry));
-            writeValueCount(stream, getCount(entry));
+            // Write value count
+            stream.writeInt(getCount(entry));
 
             // Write value
-            Object value = entry.getValue();
-            if (value instanceof Directory) {
-                if (value instanceof CompoundDirectory) {
-                    // Can't have both nested and linked IFDs
-                    throw new AssertionError("SubIFD cannot contain linked IFDs");
-                }
-
-                // We can't write offset here, we need to write value, as both LONG/IFD and LONG8/IFD8 is allowed
-                // TODO: Or possibly gloss over, by always writing IFD8 for BigTIFF?
-                long streamPosition = stream.getStreamPosition() + offsetSize;
-                writeValueInline(dataOffset, getType(entry), stream);
+            if (entry.getValue() instanceof Directory) {
+                // TODO: This could possibly be a compound directory, in which case the count should be > 1
+                stream.writeInt(assertIntegerOffset(dataOffset));
+                long streamPosition = stream.getStreamPosition();
                 stream.seek(dataOffset);
-                Directory subIFD = (Directory) value;
+                Directory subIFD = (Directory) entry.getValue();
                 writeIFD(subIFD, stream, true);
                 dataOffset += computeDataSize(subIFD);
                 stream.seek(streamPosition);
@@ -187,26 +161,8 @@ public final class TIFFWriter extends MetadataWriter {
         return ifdOffset;
     }
 
-    private void writeDirectoryCount(ImageOutputStream stream, int count) throws IOException {
-        if (longOffsets) {
-            stream.writeLong(count);
-        }
-        else {
-            stream.writeShort(count);
-        }
-    }
-
-    private void writeValueCount(ImageOutputStream stream, int count) throws IOException {
-        if (longOffsets) {
-            stream.writeLong(count);
-        }
-        else {
-            stream.writeInt(count);
-        }
-    }
-
-    public long computeIFDSize(final Collection<? extends Entry> directory) {
-        return directoryCountLength + computeDataSize(new IFD(directory)) + directory.size() * entryLength;
+    public long computeIFDSize(final Collection<Entry> directory) {
+        return WORD_LENGTH + computeDataSize(new IFD(directory)) + directory.size() * ENTRY_LENGTH;
     }
 
     private long computeDataSize(final Directory directory) {
@@ -219,13 +175,13 @@ public final class TIFFWriter extends MetadataWriter {
                 throw new IllegalArgumentException(String.format("Unknown size for entry %s", entry));
             }
 
-            if (length > offsetSize) {
+            if (length > LONGWORD_LENGTH) {
                 dataSize += length;
             }
 
             if (entry.getValue() instanceof Directory) {
                 Directory subIFD = (Directory) entry.getValue();
-                long subIFDSize = directoryCountLength + computeDataSize(subIFD) + subIFD.size() * entryLength;
+                long subIFDSize = WORD_LENGTH + subIFD.size() * ENTRY_LENGTH + computeDataSize(subIFD);
                 dataSize += subIFDSize;
             }
         }
@@ -273,11 +229,11 @@ public final class TIFFWriter extends MetadataWriter {
         short type = getType(entry);
         long valueLength = getValueLength(type, getCount(entry));
 
-        if (valueLength <= offsetSize) {
+        if (valueLength <= LONGWORD_LENGTH) {
             writeValueInline(entry.getValue(), type, stream);
 
             // Pad
-            for (long i = valueLength; i < offsetSize; i++) {
+            for (long i = valueLength; i < LONGWORD_LENGTH; i++) {
                 stream.write(0);
             }
 
@@ -292,7 +248,7 @@ public final class TIFFWriter extends MetadataWriter {
 
     private int getCount(final Entry entry) {
         Object value = entry.getValue();
-        return value instanceof String ? ((String) value).getBytes(StandardCharsets.UTF_8).length + 1 : entry.valueCount();
+        return value instanceof String ? ((String) value).getBytes(Charset.forName("UTF-8")).length + 1 : entry.valueCount();
     }
 
     private void writeValueInline(final Object value, final short type, final ImageOutputStream stream) throws IOException {
@@ -388,28 +344,12 @@ public final class TIFFWriter extends MetadataWriter {
                         doubles = (double[]) value;
                     }
                     else {
-                        throw new IllegalArgumentException("Unsupported type for TIFF DOUBLE: " + value.getClass());
+                        throw new IllegalArgumentException("Unsupported type for TIFF FLOAT: " + value.getClass());
                     }
 
                     stream.writeDoubles(doubles, 0, doubles.length);
 
                     break;
-                case TIFF.TYPE_LONG8:
-                case TIFF.TYPE_SLONG8:
-                    if (longOffsets) {
-                        long[] longs;
-
-                        if (value instanceof long[]) {
-                            longs = (long[]) value;
-                        }
-                        else {
-                            throw new IllegalArgumentException("Unsupported type for TIFF LONG8: " + value.getClass());
-                        }
-
-                        stream.writeLongs(longs, 0, longs.length);
-
-                        break;
-                    }
 
                 default:
                     throw new IllegalArgumentException("Unsupported TIFF type: " + type);
@@ -433,7 +373,6 @@ public final class TIFFWriter extends MetadataWriter {
                     break;
                 case TIFF.TYPE_LONG:
                 case TIFF.TYPE_SLONG:
-                case TIFF.TYPE_IFD:
                     stream.writeInt(((Number) value).intValue());
                     break;
                 case TIFF.TYPE_RATIONAL:
@@ -448,13 +387,6 @@ public final class TIFFWriter extends MetadataWriter {
                 case TIFF.TYPE_DOUBLE:
                     stream.writeDouble(((Number) value).doubleValue());
                     break;
-                case TIFF.TYPE_LONG8:
-                case TIFF.TYPE_SLONG8:
-                case TIFF.TYPE_IFD8:
-                    if (longOffsets) {
-                        stream.writeLong(((Number) value).longValue());
-                        break;
-                    }
 
                 default:
                     throw new IllegalArgumentException("Unsupported TIFF type: " + type);
@@ -463,39 +395,18 @@ public final class TIFFWriter extends MetadataWriter {
     }
 
     private void writeValueAt(final long dataOffset, final Object value, final short type, final ImageOutputStream stream) throws IOException {
-        writeOffset(stream, dataOffset);
+        stream.writeInt(assertIntegerOffset(dataOffset));
         long position = stream.getStreamPosition();
         stream.seek(dataOffset);
         writeValueInline(value, type, stream);
         stream.seek(position);
     }
 
-    public void writeOffset(final ImageOutputStream output, long offset) throws IOException {
-        if (longOffsets) {
-            output.writeLong(assertLongOffset(offset));
-        }
-        else {
-            output.writeInt(assertIntegerOffset(offset)); // Treated as unsigned
-        }
-    }
-
-    public int offsetSize() {
-        return offsetSize;
-    }
-
-    private int assertIntegerOffset(final long offset) throws IIOException {
-        if (offset < 0 || offset > Integer.MAX_VALUE - (long) Integer.MIN_VALUE) {
+    private int assertIntegerOffset(long offset) throws IIOException {
+        if (offset > Integer.MAX_VALUE - (long) Integer.MIN_VALUE) {
             throw new IIOException("Integer overflow for TIFF stream");
         }
 
         return (int) offset;
     }
-
-    private long assertLongOffset(final long offset) throws IIOException {
-        if (offset < 0) {
-            throw new IIOException("Long overflow for BigTIFF stream");
-        }
-
-        return offset;
-    }
 }

imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/tiff/BigTIFFWriterTest.java

@@ -1,345 +0,0 @@
-/*
- * Copyright (c) 2013, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.metadata.tiff;
-
-import com.twelvemonkeys.imageio.metadata.*;
-import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
-import com.twelvemonkeys.io.FastByteArrayOutputStream;
-
-import org.junit.Test;
-
-import javax.imageio.ImageIO;
-import javax.imageio.stream.ImageOutputStream;
-import javax.imageio.stream.ImageOutputStreamImpl;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-/**
- * TIFFWriterTest
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: TIFFWriterTest.java,v 1.0 18.07.13 09:53 haraldk Exp$
- */
-public class BigTIFFWriterTest extends MetadataWriterAbstractTest {
-
-    @Override
-    protected InputStream getData() throws IOException {
-        // TODO: Replace with BigTIFF resource
-        return getResource("/exif/exif-jpeg-segment.bin").openStream();
-    }
-
-    protected TIFFReader createReader() {
-        return new TIFFReader();
-    }
-
-    @Override
-    protected TIFFWriter createWriter() {
-        return new TIFFWriter(8);
-    }
-
-    @Test
-    public void testWriteReadSimple() throws IOException {
-        ArrayList<Entry> entries = new ArrayList<>();
-        entries.add(new TIFFEntry(TIFF.TAG_ORIENTATION, TIFF.TYPE_SHORT, 1));
-        entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_SHORT, 1600));
-        entries.add(new AbstractEntry(TIFF.TAG_IMAGE_HEIGHT, 900) {});
-        entries.add(new TIFFEntry(TIFF.TAG_ARTIST, TIFF.TYPE_ASCII, "Harald K."));
-        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
-        Directory directory = new AbstractDirectory(entries) {};
-
-        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
-        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
-        createWriter().write(directory, imageStream);
-        imageStream.flush();
-
-        assertEquals(output.size(), imageStream.getStreamPosition());
-
-        byte[] data = output.toByteArray();
-
-        assertEquals(164, data.length);
-        assertEquals('M', data[0]);
-        assertEquals('M', data[1]);
-        assertEquals(0, data[2]);
-        assertEquals(43, data[3]);
-
-        Directory read = createReader().read(new ByteArrayImageInputStream(data));
-
-        assertNotNull(read);
-        assertEquals(5, read.size());
-
-        // TODO: Assert that the tags are written in ascending order (don't test the read directory, but the file structure)!
-
-        assertNotNull(read.getEntryById(TIFF.TAG_SOFTWARE));
-        assertEquals("TwelveMonkeys ImageIO", read.getEntryById(TIFF.TAG_SOFTWARE).getValue());
-
-        assertNotNull(read.getEntryById(TIFF.TAG_IMAGE_WIDTH));
-        assertEquals(1600, read.getEntryById(TIFF.TAG_IMAGE_WIDTH).getValue());
-
-        assertNotNull(read.getEntryById(TIFF.TAG_IMAGE_HEIGHT));
-        assertEquals(900, read.getEntryById(TIFF.TAG_IMAGE_HEIGHT).getValue());
-
-        assertNotNull(read.getEntryById(TIFF.TAG_ORIENTATION));
-        assertEquals(1, read.getEntryById(TIFF.TAG_ORIENTATION).getValue());
-
-        assertNotNull(read.getEntryById(TIFF.TAG_ARTIST));
-        assertEquals("Harald K.", read.getEntryById(TIFF.TAG_ARTIST).getValue());
-    }
-
-    @Test
-    public void testWriteMotorola() throws IOException {
-        ArrayList<Entry> entries = new ArrayList<>();
-        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
-        entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_LONG, Integer.MAX_VALUE));
-        Directory directory = new AbstractDirectory(entries) {};
-
-        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
-        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
-
-        imageStream.setByteOrder(ByteOrder.BIG_ENDIAN); // BE = Motorola
-
-        createWriter().write(directory, imageStream);
-        imageStream.flush();
-
-        assertEquals(output.size(), imageStream.getStreamPosition());
-
-        byte[] data = output.toByteArray();
-
-        assertEquals(94, data.length);
-        assertEquals('M', data[0]);
-        assertEquals('M', data[1]);
-        assertEquals(0, data[2]);
-        assertEquals(43, data[3]);
-
-        Directory read = new TIFFReader().read(new ByteArrayImageInputStream(data));
-
-        assertNotNull(read);
-        assertEquals(2, read.size());
-        assertNotNull(read.getEntryById(TIFF.TAG_SOFTWARE));
-        assertEquals("TwelveMonkeys ImageIO", read.getEntryById(TIFF.TAG_SOFTWARE).getValue());
-        assertNotNull(read.getEntryById(TIFF.TAG_IMAGE_WIDTH));
-        assertEquals((long) Integer.MAX_VALUE, read.getEntryById(TIFF.TAG_IMAGE_WIDTH).getValue());
-    }
-
-    @Test
-    public void testWriteIntel() throws IOException {
-        ArrayList<Entry> entries = new ArrayList<>();
-        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
-        entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_LONG, Integer.MAX_VALUE));
-        Directory directory = new AbstractDirectory(entries) {};
-
-        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
-        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
-
-        imageStream.setByteOrder(ByteOrder.LITTLE_ENDIAN); // LE = Intel
-
-        createWriter().write(directory, imageStream);
-        imageStream.flush();
-
-        assertEquals(output.size(), imageStream.getStreamPosition());
-
-        byte[] data = output.toByteArray();
-
-        assertEquals(94, data.length);
-        assertEquals('I', data[0]);
-        assertEquals('I', data[1]);
-        assertEquals(43, data[2]);
-        assertEquals(0, data[3]);
-
-        Directory read = new TIFFReader().read(new ByteArrayImageInputStream(data));
-
-        assertNotNull(read);
-        assertEquals(2, read.size());
-        assertNotNull(read.getEntryById(TIFF.TAG_SOFTWARE));
-        assertEquals("TwelveMonkeys ImageIO", read.getEntryById(TIFF.TAG_SOFTWARE).getValue());
-        assertNotNull(read.getEntryById(TIFF.TAG_IMAGE_WIDTH));
-        assertEquals((long) Integer.MAX_VALUE, read.getEntryById(TIFF.TAG_IMAGE_WIDTH).getValue());
-    }
-
-    @Test
-    public void testNestingIFD8Long8() throws IOException {
-        TIFFEntry artist = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO");
-
-        TIFFEntry subSubSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD8, new IFD(Collections.singletonList(artist)));
-        TIFFEntry subSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG8, new IFD(Collections.singletonList(subSubSubSubIFD)));
-        TIFFEntry subSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG8, new IFD(Collections.singletonList(subSubSubIFD)));
-        TIFFEntry subIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD8, new IFD(Collections.singletonList(subSubIFD)));
-
-        Directory directory = new IFD(Collections.<Entry>singletonList(subIFD));
-
-        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
-        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
-
-        createWriter().write(directory, imageStream);
-        imageStream.flush();
-
-        assertEquals(output.size(), imageStream.getStreamPosition());
-
-        Directory read = new TIFFReader().read(new ByteArrayImageInputStream(output.toByteArray()));
-
-        assertNotNull(read);
-        assertEquals(1, read.size());
-        assertEquals(subIFD, read.getEntryById(TIFF.TAG_SUB_IFD)); // Recursively tests content!
-    }
-
-    @Test
-    public void testNestingIFDLong() throws IOException {
-        TIFFEntry artist = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO");
-
-        TIFFEntry subSubSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD, new IFD(Collections.singletonList(artist)));
-        TIFFEntry subSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG, new IFD(Collections.singletonList(subSubSubSubIFD)));
-        TIFFEntry subSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG, new IFD(Collections.singletonList(subSubSubIFD)));
-        TIFFEntry subIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD, new IFD(Collections.singletonList(subSubIFD)));
-
-        Directory directory = new IFD(Collections.<Entry>singletonList(subIFD));
-
-        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
-        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
-
-        createWriter().write(directory, imageStream);
-        imageStream.flush();
-
-        assertEquals(output.size(), imageStream.getStreamPosition());
-
-        Directory read = new TIFFReader().read(new ByteArrayImageInputStream(output.toByteArray()));
-
-        assertNotNull(read);
-        assertEquals(1, read.size());
-        assertEquals(subIFD, read.getEntryById(TIFF.TAG_SUB_IFD)); // Recursively tests content!
-    }
-
-    @Test
-    public void testReadWriteRead() throws IOException {
-        Directory original = createReader().read(getDataAsIIS());
-
-        ByteArrayOutputStream output = new FastByteArrayOutputStream(256);
-        ImageOutputStream imageOutput = ImageIO.createImageOutputStream(output);
-
-        try {
-            createWriter().write(original, imageOutput);
-        }
-        finally {
-            imageOutput.close();
-        }
-
-        Directory read = createReader().read(new ByteArrayImageInputStream(output.toByteArray()));
-
-        assertEquals(original, read);
-    }
-
-    @Test
-    public void testComputeIFDSize() throws IOException {
-        ArrayList<Entry> entries = new ArrayList<>();
-        entries.add(new TIFFEntry(TIFF.TAG_ORIENTATION, TIFF.TYPE_SHORT, 1));
-        entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_SHORT, 1600));
-        entries.add(new AbstractEntry(TIFF.TAG_IMAGE_HEIGHT, 900) {});
-        entries.add(new TIFFEntry(TIFF.TAG_ARTIST, TIFF.TYPE_ASCII, "Harald K."));
-        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
-
-        TIFFWriter writer = createWriter();
-
-        ImageOutputStream stream = new NullImageOutputStream();
-        writer.writeIFD(entries, stream);
-
-        assertEquals(140, writer.computeIFDSize(entries));
-        assertEquals(148, stream.getStreamPosition());
-    }
-
-    @Test
-    public void testComputeIFDSizeNestedIFD8Long8() throws IOException {
-        TIFFEntry artist = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO");
-
-        TIFFEntry subSubSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD8, new IFD(Collections.singletonList(artist)));
-        TIFFEntry subSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG8, new IFD(Collections.singletonList(subSubSubSubIFD)));
-        TIFFEntry subSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG8, new IFD(Collections.singletonList(subSubSubIFD)));
-        TIFFEntry subIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD8, new IFD(Collections.singletonList(subSubIFD)));
-
-        List<Entry> entries = Collections.<Entry>singletonList(subIFD);
-
-        TIFFWriter writer = createWriter();
-
-        ImageOutputStream stream = new NullImageOutputStream();
-        writer.writeIFD(entries, stream);
-
-        assertEquals(162, writer.computeIFDSize(entries));
-        assertEquals(170, stream.getStreamPosition());
-    }
-
-    @Test
-    public void testComputeIFDSizeNestedIFDLong() throws IOException {
-        TIFFEntry artist = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO");
-
-        TIFFEntry subSubSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD, new IFD(Collections.singletonList(artist)));
-        TIFFEntry subSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG, new IFD(Collections.singletonList(subSubSubSubIFD)));
-        TIFFEntry subSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG, new IFD(Collections.singletonList(subSubSubIFD)));
-        TIFFEntry subIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD, new IFD(Collections.singletonList(subSubIFD)));
-
-        List<Entry> entries = Collections.<Entry>singletonList(subIFD);
-
-        TIFFWriter writer = createWriter();
-
-        ImageOutputStream stream = new NullImageOutputStream();
-        writer.writeIFD(entries, stream);
-
-        assertEquals(162, writer.computeIFDSize(entries)); // 162 = 5 * (8 + 20) + 22
-        assertEquals(170, stream.getStreamPosition()); // 170 = 8 + 5 * (8 + 20) + 22
-    }
-
-    private static class NullImageOutputStream extends ImageOutputStreamImpl {
-        @Override
-        public void write(int b) throws IOException {
-            streamPos++;
-        }
-
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            streamPos += len;
-        }
-
-        @Override
-        public int read() throws IOException {
-            throw new UnsupportedOperationException("Method read not implemented");
-        }
-
-        @Override
-        public int read(byte[] b, int off, int len) throws IOException {
-            throw new UnsupportedOperationException("Method read not implemented");
-        }
-    }
-}

imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/tiff/TIFFWriterTest.java

@@ -33,7 +33,6 @@ package com.twelvemonkeys.imageio.metadata.tiff;
 import com.twelvemonkeys.imageio.metadata.*;
 import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
 import com.twelvemonkeys.io.FastByteArrayOutputStream;
-
 import org.junit.Test;
 
 import javax.imageio.ImageIO;
@@ -85,7 +84,7 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
 
         ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
         ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
-        createWriter().write(directory, imageStream);
+        new TIFFWriter().write(directory, imageStream);
         imageStream.flush();
 
         assertEquals(output.size(), imageStream.getStreamPosition());
@@ -133,7 +132,7 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
 
         imageStream.setByteOrder(ByteOrder.BIG_ENDIAN); // BE = Motorola
 
-        createWriter().write(directory, imageStream);
+        new TIFFWriter().write(directory, imageStream);
         imageStream.flush();
 
         assertEquals(output.size(), imageStream.getStreamPosition());
@@ -168,7 +167,7 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
 
         imageStream.setByteOrder(ByteOrder.LITTLE_ENDIAN); // LE = Intel
 
-        createWriter().write(directory, imageStream);
+        new TIFFWriter().write(directory, imageStream);
         imageStream.flush();
 
         assertEquals(output.size(), imageStream.getStreamPosition());
@@ -205,7 +204,7 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
         ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
         ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
 
-        createWriter().write(directory, imageStream);
+        new TIFFWriter().write(directory, imageStream);
         imageStream.flush();
 
         assertEquals(output.size(), imageStream.getStreamPosition());
@@ -248,10 +247,9 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
         TIFFWriter writer = createWriter();
 
         ImageOutputStream stream = new NullImageOutputStream();
-        writer.writeIFD(entries, stream);
+        writer.write(new IFD(entries), stream);
 
-        assertEquals(94, writer.computeIFDSize(entries));
-        assertEquals(98, stream.getStreamPosition());
+        assertEquals(stream.getStreamPosition(), writer.computeIFDSize(entries) + 12);
     }
 
     @Test
@@ -268,10 +266,9 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
         TIFFWriter writer = createWriter();
 
         ImageOutputStream stream = new NullImageOutputStream();
-        writer.writeIFD(entries, stream);
+        writer.write(new IFD(entries), stream);
 
-        assertEquals(92, writer.computeIFDSize(entries)); // 92 = 5 * (2 + 12) + 22
-        assertEquals(96, stream.getStreamPosition()); // 96 = 4 + 5 * (2 + 12) + 22
+        assertEquals(stream.getStreamPosition(), writer.computeIFDSize(entries) + 12);
     }
 
     private static class NullImageOutputStream extends ImageOutputStreamImpl {

imageio/imageio-nef/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2014, Harald Kuhr
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without
+  ~ modification, are permitted provided that the following conditions are met:
+  ~     * Redistributions of source code must retain the above copyright
+  ~       notice, this list of conditions and the following disclaimer.
+  ~     * Redistributions in binary form must reproduce the above copyright
+  ~       notice, this list of conditions and the following disclaimer in the
+  ~       documentation and/or other materials provided with the distribution.
+  ~     * Neither the name "TwelveMonkeys" nor the
+  ~       names of its contributors may be used to endorse or promote products
+  ~       derived from this software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  ~ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  ~ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  ~ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  ~ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  ~ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>imageio</artifactId>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <version>3.8.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>imageio-nef</artifactId>
+    <name>TwelveMonkeys :: ImageIO :: NEF plugin</name>
+    <description>ImageIO plugin for Nikon Electronic File (NEF).</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-metadata</artifactId>
+        </dependency>
+        <dependency>
+            <version>${project.version}</version>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-jpeg</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReader.java

@@ -0,0 +1,764 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.nef;
+
+import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.metadata.CompoundDirectory;
+import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
+import com.twelvemonkeys.imageio.stream.SubImageInputStream;
+
+import javax.imageio.*;
+import javax.imageio.spi.ImageReaderSpi;
+import javax.imageio.stream.ImageInputStream;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;
+import java.io.DataInput;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
+
+/**
+ * Nikon NEF RAW ImageReader
+ * <p/>
+ * Acknowledgement:
+ * This ImageReader is based on the excellent work of Laurent Clevy, and would probably not exist without it.
+ *
+ * @see <a href="http://lclevy.free.fr/nef/">Nikon Electronic File (NEF) file format description</a>
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: NEFImageReader.java,v 1.0 07.04.14 21:31 haraldk Exp$
+ */
+public final class NEFImageReader extends ImageReaderBase {
+    // See http://lclevy.free.fr/nef/
+    // TODO: Avoid duped code from TIFFImageReader
+    // TODO: Probably a good idea to move some of the getAsShort/Int/Long/Array to TIFF/EXIF metadata module
+    // TODO: Automatic EXIF rotation, if we find a good way to do that for JPEG/EXIF/TIFF and keeping the metadata sane...
+
+    static final boolean DEBUG =  true; //"true".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.imageio.plugins.nef.debug"));
+    private static final ImageTypeSpecifier THUMB_SPEC = ImageTypeSpecifier.createInterleaved(ColorSpace.getInstance(ColorSpace.CS_sRGB), new int[]{0, 1, 2}, DataBuffer.TYPE_BYTE, false, false);
+
+    // The Makernote has the NikonImagePreview tag (0x0011) which contains a thumbnail image (in lossy jpeg).
+    // IFD#0 also contains a thumbnail image in uncompressed TIFF, size is 160x120.
+    // Thumbnail is always in IFD0..
+    private final static int THUMBNAIL_IFD = 0;
+
+    private CompoundDirectory IFDs;
+    private List<Directory> subIFDs;
+    private Directory currentIFD;
+
+    NEFImageReader(final ImageReaderSpi provider) {
+        super(provider);
+    }
+
+    @Override
+    protected void resetMembers() {
+        IFDs = null;
+        subIFDs = null;
+        currentIFD = null;
+    }
+
+    private void readMetadata() throws IOException {
+        if (imageInput == null) {
+            throw new IllegalStateException("input not set");
+        }
+
+        if (IFDs == null) {
+            imageInput.seek(0);
+
+            IFDs = (CompoundDirectory) new TIFFReader().read(imageInput); // NOTE: Sets byte order as a side effect
+
+            // Pull up the sub-ifds now
+            Entry subIFDEntry = IFDs.getEntryById(TIFF.TAG_SUB_IFD);
+
+            if (subIFDEntry != null) {
+                Object subIFD = subIFDEntry.getValue();
+
+                if (subIFD instanceof Directory) {
+                    subIFDs = Collections.singletonList((Directory) subIFD);
+                }
+                else {
+                    Directory[] directories = (Directory[]) subIFD;
+
+                    if (directories.length != 2) {
+                        throw new IIOException("Unexpected number of SubIFDs in NEF: " + directories.length);
+                    }
+
+                    subIFDs = Arrays.asList(directories);
+                }
+            }
+            else {
+                throw new IIOException("Unexpected number of SubIFDs in NEF: " + 0);
+            }
+
+            if (DEBUG) {
+                System.err.println("Byte order: " + imageInput.getByteOrder());
+                System.err.println("Number of IFDs: " + IFDs.directoryCount());
+
+                for (int i = 0; i < IFDs.directoryCount(); i++) {
+                    System.err.printf("IFD %d: %s\n", i, IFDs.getDirectory(i));
+                }
+            }
+        }
+    }
+
+    private void readIFD(final int ifdIndex) throws IOException {
+        readMetadata();
+
+        if (ifdIndex < 0) {
+            throw new IndexOutOfBoundsException("index < minIndex");
+        }
+        else {
+            int numIFDs = IFDs.directoryCount() + subIFDs.size();
+
+            if (ifdIndex >= numIFDs) {
+                throw new IndexOutOfBoundsException("index >= numIFDs (" + ifdIndex + " >= " + numIFDs + ")");
+            }
+        }
+
+        // Depth first (...but a DNG should only contain one IFD with subIFDs)
+        if (ifdIndex == 0) {
+            currentIFD = IFDs.getDirectory(ifdIndex);
+        }
+        else if (ifdIndex <= subIFDs.size()) {
+            currentIFD = subIFDs.get(ifdIndex - 1);
+        }
+        else {
+            currentIFD = IFDs.getDirectory(ifdIndex - subIFDs.size());
+        }
+    }
+
+    @Override
+    public int getNumImages(final boolean allowSearch) throws IOException {
+        readMetadata();
+
+        return subIFDs.size(); // IFD0 is always thumbnail
+    }
+
+    @Override
+    public int getNumThumbnails(int imageIndex) throws IOException {
+        readMetadata();
+        checkBounds(imageIndex);
+
+        return imageIndex == 0 ? 1 : 0;
+    }
+
+    @Override
+    public boolean readerSupportsThumbnails() {
+        return true;
+    }
+
+    @Override
+    public int getThumbnailWidth(int imageIndex, int thumbnailIndex) throws IOException {
+        readIFD(THUMBNAIL_IFD);
+
+        if (imageIndex != 0) {
+            throw new IndexOutOfBoundsException("No thumbnail for imageIndex: " + imageIndex);
+        }
+        if (thumbnailIndex != 0) {
+            throw new IndexOutOfBoundsException("thumbnailIndex out of bounds: " + thumbnailIndex);
+        }
+
+        return getValueAsInt(TIFF.TAG_IMAGE_WIDTH, "ImageWidth");
+    }
+
+    @Override
+    public int getThumbnailHeight(int imageIndex, int thumbnailIndex) throws IOException {
+        readIFD(THUMBNAIL_IFD);
+
+        if (imageIndex != 0) {
+            throw new IndexOutOfBoundsException("No thumbnail for imageIndex: " + imageIndex);
+        }
+        if (thumbnailIndex != 0) {
+            throw new IndexOutOfBoundsException("thumbnailIndex out of bounds: " + thumbnailIndex);
+        }
+
+        return getValueAsInt(TIFF.TAG_IMAGE_HEIGHT, "ImageHeight");
+    }
+
+    @Override
+    public BufferedImage readThumbnail(int imageIndex, int thumbnailIndex) throws IOException {
+        readIFD(THUMBNAIL_IFD);
+
+        if (imageIndex != 0) {
+            throw new IndexOutOfBoundsException("No thumbnail for imageIndex: " + imageIndex);
+        }
+        if (thumbnailIndex != 0) {
+            throw new IndexOutOfBoundsException("thumbnailIndex out of bounds: " + thumbnailIndex);
+        }
+
+        // Read uncompressed RGB
+        int imageWidth = getValueAsInt(TIFF.TAG_IMAGE_WIDTH, "ImageWidth");
+        int imageHeight = getValueAsInt(TIFF.TAG_IMAGE_HEIGHT, "ImageHeight");
+
+        // NEF thumbnail simplification: single strip
+        long stripOffset = getValueAsLong(TIFF.TAG_STRIP_OFFSETS, "StripOffsets");
+        long stripCount = getValueAsLong(TIFF.TAG_STRIP_BYTE_COUNTS, "StripByteCounts");
+
+        BufferedImage thumbnail = THUMB_SPEC.createBufferedImage(imageWidth, imageHeight);
+
+        WritableRaster raster = thumbnail.getRaster();
+        DataBufferByte dataBuffer = (DataBufferByte) raster.getDataBuffer();
+
+        imageInput.seek(stripOffset);
+        ImageInputStream stream = new SubImageInputStream(imageInput, stripCount);
+
+        try {
+            stream.readFully(dataBuffer.getData());
+        }
+        finally {
+            stream.close();
+        }
+
+        return thumbnail;
+    }
+
+    private long[] getValueAsLongArray(final int tag, final String tagName, boolean required) throws IIOException {
+        Entry entry = currentIFD.getEntryById(tag);
+        if (entry == null) {
+            if (required) {
+                throw new IIOException("Missing TIFF tag " + tagName);
+            }
+
+            return null;
+        }
+
+        long[] value;
+
+        if (entry.valueCount() == 1) {
+            // For single entries, this will be a boxed type
+            value = new long[] {((Number) entry.getValue()).longValue()};
+        }
+        else if (entry.getValue() instanceof short[]) {
+            short[] shorts = (short[]) entry.getValue();
+            value = new long[shorts.length];
+
+            for (int i = 0, length = value.length; i < length; i++) {
+                value[i] = shorts[i];
+            }
+        }
+        else if (entry.getValue() instanceof int[]) {
+            int[] ints = (int[]) entry.getValue();
+            value = new long[ints.length];
+
+            for (int i = 0, length = value.length; i < length; i++) {
+                value[i] = ints[i];
+            }
+        }
+        else if (entry.getValue() instanceof long[]) {
+            value = (long[]) entry.getValue();
+        }
+        else {
+            throw new IIOException(String.format("Unsupported %s type: %s (%s)", tagName, entry.getTypeName(), entry.getValue().getClass()));
+        }
+
+        return value;
+    }
+
+    private Number getValueAsNumberWithDefault(final int tag, final String tagName, final Number defaultValue) throws IIOException {
+        Entry entry = currentIFD.getEntryById(tag);
+
+        if (entry == null) {
+            if (defaultValue != null)  {
+                return defaultValue;
+            }
+
+            throw new IIOException("Missing TIFF tag: " + (tagName != null ? tagName : tag));
+        }
+
+        return (Number) entry.getValue();
+    }
+
+    private long getValueAsLongWithDefault(final int tag, final String tagName, final Long defaultValue) throws IIOException {
+        return getValueAsNumberWithDefault(tag, tagName, defaultValue).longValue();
+    }
+
+    private long getValueAsLongWithDefault(final int tag, final Long defaultValue) throws IIOException {
+        return getValueAsLongWithDefault(tag, null, defaultValue);
+    }
+
+    private long getValueAsLong(final int tag, String tagName) throws IIOException {
+        return getValueAsLongWithDefault(tag, tagName, null);
+    }
+
+    private int getValueAsIntWithDefault(final int tag, final String tagName, final Integer defaultValue) throws IIOException {
+        return getValueAsNumberWithDefault(tag, tagName, defaultValue).intValue();
+    }
+
+    private int getValueAsIntWithDefault(final int tag, Integer defaultValue) throws IIOException {
+        return getValueAsIntWithDefault(tag, null, defaultValue);
+    }
+
+    private int getValueAsInt(final int tag, String tagName) throws IIOException {
+        return getValueAsIntWithDefault(tag, tagName, null);
+    }
+
+    private int imageIndexToIFDNumber(int imageIndex) {
+        return imageIndex >= THUMBNAIL_IFD ? imageIndex + 1 : imageIndex;
+    }
+
+    @Override
+    public int getWidth(int imageIndex) throws IOException {
+        readIFD(imageIndexToIFDNumber(imageIndex));
+
+        return getValueAsInt(TIFF.TAG_IMAGE_WIDTH, "ImageWidth");
+    }
+
+    @Override
+    public int getHeight(int imageIndex) throws IOException {
+        readIFD(imageIndexToIFDNumber(imageIndex));
+
+        return getValueAsInt(TIFF.TAG_IMAGE_HEIGHT, "ImageHeight");
+    }
+
+    @Override
+    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
+        readIFD(imageIndexToIFDNumber(imageIndex));
+
+        int photometricInterpretation = getValueAsInt(TIFF.TAG_PHOTOMETRIC_INTERPRETATION, "PhotometricInterpretation");
+        long[] bitsPerSample = getValueAsLongArray(TIFF.TAG_BITS_PER_SAMPLE, "BitsPerSample", true);
+        int bitDepth = (int) bitsPerSample[0]; // Assume all equal!
+
+        ColorSpace cs;
+
+        if (photometricInterpretation == 2) {
+            cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+        }
+        else {
+            cs = ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB);
+        }
+
+        if (bitDepth == 8) {
+            return Arrays.asList(ImageTypeSpecifier.createInterleaved(cs, new int [] {0, 1, 2}, DataBuffer.TYPE_BYTE, false, false)).iterator();
+        }
+        else if (bitDepth > 8 && bitDepth <= 16) {
+            return Arrays.asList(ImageTypeSpecifier.createInterleaved(cs, new int [] {0, 1, 2}, DataBuffer.TYPE_USHORT, false, false)).iterator();
+        }
+
+        throw new IIOException("Unsupported bit depth: " + bitDepth);
+    }
+
+    @Override
+    public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException {
+        readIFD(imageIndexToIFDNumber(imageIndex));
+
+        int compression = getValueAsInt(TIFF.TAG_COMPRESSION, "Compression");
+        int width;
+        int height;
+
+        ImageInputStream stream;
+        switch (compression) {
+            case 1: // Uncompressed
+                width = getValueAsInt(TIFF.TAG_IMAGE_WIDTH, "ImageWidth");
+                height = getValueAsInt(TIFF.TAG_IMAGE_HEIGHT, "ImageHeight");
+
+                // TODO: Read as uncompressed TIFF (share code with TIFFImageReader?)
+                // TODO: Remove duped code!!
+                BufferedImage destination = getDestination(param, getImageTypes(imageIndex), width, height);
+
+                // NOTE: We handle strips as tiles of tileWidth == width by tileHeight == rowsPerStrip
+                //       Strips are top/down, tiles are left/right, top/down
+                int stripTileWidth = width;
+                long rowsPerStrip = getValueAsLongWithDefault(TIFF.TAG_ROWS_PER_STRIP, (1l << 32) - 1);
+                int stripTileHeight = rowsPerStrip < height ? (int) rowsPerStrip : height;
+
+                long[] stripTileOffsets = getValueAsLongArray(TIFF.TAG_TILE_OFFSETS, "TileOffsets", false);
+                long[] stripTileByteCounts;
+
+                if (stripTileOffsets != null) {
+                    stripTileByteCounts = getValueAsLongArray(TIFF.TAG_TILE_BYTE_COUNTS, "TileByteCounts", false);
+                    if (stripTileByteCounts == null) {
+                        processWarningOccurred("Missing TileByteCounts for tiled TIFF with compression: " + compression);
+                    }
+
+                    stripTileWidth = getValueAsInt(TIFF.TAG_TILE_WIDTH, "TileWidth");
+                    stripTileHeight = getValueAsInt(TIFF.TAG_TILE_HEIGTH, "TileHeight");
+                }
+                else {
+                    stripTileOffsets = getValueAsLongArray(TIFF.TAG_STRIP_OFFSETS, "StripOffsets", true);
+                    stripTileByteCounts = getValueAsLongArray(TIFF.TAG_STRIP_BYTE_COUNTS, "StripByteCounts", false);
+                    if (stripTileByteCounts == null) {
+                        processWarningOccurred("Missing StripByteCounts for TIFF with compression: " + compression);
+                    }
+
+                    // NOTE: This is really against the spec, but libTiff seems to handle it. TIFF 6.0 says:
+                    //       "Do not use both strip- oriented and tile-oriented fields in the same TIFF file".
+                    stripTileWidth = getValueAsIntWithDefault(TIFF.TAG_TILE_WIDTH, "TileWidth", stripTileWidth);
+                    stripTileHeight = getValueAsIntWithDefault(TIFF.TAG_TILE_HEIGTH, "TileHeight", stripTileHeight);
+                }
+
+                int tilesAcross = (width + stripTileWidth - 1) / stripTileWidth;
+                int tilesDown = (height + stripTileHeight - 1) / stripTileHeight;
+
+
+
+                ImageTypeSpecifier rawType = getRawImageType(imageIndex);
+                checkReadParamBandSettings(param, rawType.getNumBands(), destination.getSampleModel().getNumBands());
+
+                final Rectangle srcRegion = new Rectangle();
+                final Rectangle dstRegion = new Rectangle();
+                computeRegions(param, width, height, destination, srcRegion, dstRegion);
+
+                int xSub = param != null ? param.getSourceXSubsampling() : 1;
+                int ySub = param != null ? param.getSourceYSubsampling() : 1;
+
+                WritableRaster destRaster = clipToRect(destination.getRaster(), dstRegion, param != null ? param.getDestinationBands() : null);
+
+                final int interpretation = getValueAsInt(TIFF.TAG_PHOTOMETRIC_INTERPRETATION, "PhotometricInterpretation");
+                final int predictor = getValueAsIntWithDefault(TIFF.TAG_PREDICTOR, 1);
+//                final int planarConfiguration = getValueAsIntWithDefault(TIFF.TAG_PLANAR_CONFIGURATION, TIFFBaseline.PLANARCONFIG_CHUNKY);
+//                final int numBands = planarConfiguration == TIFFExtension.PLANARCONFIG_PLANAR ? 1 : rawType.getNumBands();
+                final int numBands = rawType.getNumBands();
+
+                WritableRaster rowRaster = rawType.getColorModel().createCompatibleWritableRaster(stripTileWidth, 1);
+                int row = 0;
+
+                // General uncompressed/compressed reading
+                for (int y = 0; y < tilesDown; y++) {
+                    int col = 0;
+                    int rowsInTile = Math.min(stripTileHeight, height - row);
+
+                    for (int x = 0; x < tilesAcross; x++) {
+                        int colsInTile = Math.min(stripTileWidth, width - col);
+                        int i = y * tilesAcross + x;
+
+                        imageInput.seek(stripTileOffsets[i]);
+
+                        // Read a full strip/tile
+                        Raster clippedRow = clipRowToRect(rowRaster, srcRegion,
+                                param != null ? param.getSourceBands() : null,
+                                param != null ? param.getSourceXSubsampling() : 1);
+                        readStripTileData(clippedRow, srcRegion, xSub, ySub, numBands, interpretation, destRaster, col, row, colsInTile, rowsInTile, imageInput);
+
+                        if (abortRequested()) {
+                            break;
+                        }
+
+                        col += colsInTile;
+                    }
+
+                    processImageProgress(100f * row / height);
+
+                    if (abortRequested()) {
+                        processReadAborted();
+                        break;
+                    }
+
+                    row += rowsInTile;
+                }
+                return getDestination(param, getImageTypes(imageIndex), width, height);
+
+            case 6: // Old-style JPEG
+                long jpegFormatStart = getValueAsLong(TIFF.TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat");
+                long jpegFormatLength = getValueAsLong(TIFF.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, "JPEGInterchangeFormatLength");
+                imageInput.seek(jpegFormatStart);
+
+                stream = new SubImageInputStream(imageInput, jpegFormatLength);
+                Iterator<ImageReader> readers = ImageIO.getImageReaders(stream); // TODO: Prefer default JPEGImageReader
+                if (!readers.hasNext()) {
+                    throw new IIOException("Could not find delegate reader for JPEG format!");
+                }
+
+                ImageReader reader = readers.next();
+
+                try {
+                    reader.setInput(stream);
+                    return reader.read(0, param);
+                }
+                finally {
+                    reader.dispose(); // TODO: Don't dispose until this instance is disposed
+                }
+
+            case 34713: // Nikon NEF compressed
+                width = getValueAsInt(TIFF.TAG_IMAGE_WIDTH, "ImageWidth");
+                height = getValueAsInt(TIFF.TAG_IMAGE_HEIGHT, "ImageHeight");
+
+                // TODO: Read Nikon NEF compressed RAW
+
+                return param != null ? param.getDestination() : null;
+
+            default:
+                throw new IIOException("Unsupported compression for NEF: " + compression);
+        }
+    }
+
+    public static void main(String[] args) throws IOException {
+        NEFImageReader reader = new NEFImageReader(new NEFImageReaderSpi());
+
+        for (String arg : args) {
+            ImageInputStream stream = ImageIO.createImageInputStream(new File(arg));
+
+            reader.setInput(stream);
+
+            int numImages = reader.getNumImages(true);
+            for (int i = 0; i < numImages; i++) {
+                int numThumbnails = reader.getNumThumbnails(i);
+                for (int n = 0; n < numThumbnails; n++) {
+                    showIt(reader.readThumbnail(i, n), arg + " image thumbnail" + n);
+                }
+
+                showIt(reader.read(i), arg + " image " + i);
+            }
+        }
+    }
+
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // DUPED CODE BELOW //// DUPED CODE BELOW //// DUPED CODE BELOW //// DUPED CODE BELOW //
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+    private int getBitsPerSample() throws IIOException {
+        long[] value = getValueAsLongArray(TIFF.TAG_BITS_PER_SAMPLE, "BitsPerSample", false);
+
+        if (value == null || value.length == 0) {
+            return 1;
+        }
+        else {
+            int bitsPerSample = (int) value[0];
+
+            for (int i = 1; i < value.length; i++) {
+                if (value[i] != bitsPerSample) {
+                    throw new IIOException("Variable BitsPerSample not supported: " + Arrays.toString(value));
+                }
+            }
+
+            return bitsPerSample;
+        }
+    }
+
+    private Raster clipRowToRect(final Raster raster, final Rectangle rect, final int[] bands, final int xSub) {
+        if (rect.contains(raster.getMinX(), 0, raster.getWidth(), 1)
+                && xSub == 1
+                && bands == null /* TODO: Compare bands with that of raster */) {
+            return raster;
+        }
+
+        return raster.createChild(rect.x / xSub, 0, rect.width / xSub, 1, 0, 0, bands);
+    }
+
+    private WritableRaster clipToRect(final WritableRaster raster, final Rectangle rect, final int[] bands) {
+        if (rect.contains(raster.getMinX(), raster.getMinY(), raster.getWidth(), raster.getHeight())
+                && bands == null /* TODO: Compare bands with that of raster */) {
+            return raster;
+        }
+
+        return raster.createWritableChild(rect.x, rect.y, rect.width, rect.height, 0, 0, bands);
+    }
+
+    private void readStripTileData(final Raster tileRowRaster, final Rectangle srcRegion, final int xSub, final int ySub,
+                                   final int numBands, final int interpretation,
+                                   final WritableRaster raster, final int startCol, final int startRow,
+                                   final int colsInTile, final int rowsInTile, final DataInput input)
+            throws IOException {
+
+        switch (tileRowRaster.getTransferType()) {
+            case DataBuffer.TYPE_BYTE:
+                byte[] rowDataByte = ((DataBufferByte) tileRowRaster.getDataBuffer()).getData();
+
+                for (int row = startRow; row < startRow + rowsInTile; row++) {
+                    if (row >= srcRegion.y + srcRegion.height) {
+                        break; // We're done with this tile
+                    }
+
+                    input.readFully(rowDataByte);
+
+                    if (row % ySub == 0 && row >= srcRegion.y) {
+                        normalizeBlack(interpretation, rowDataByte);
+
+                        // 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++) {
+                                    rowDataByte[x + b] = rowDataByte[x * xSub + b];
+                                }
+                            }
+                        }
+
+                        raster.setDataElements(startCol, (row - srcRegion.y) / ySub, tileRowRaster);
+                    }
+                    // Else skip data
+                }
+
+                break;
+            case DataBuffer.TYPE_USHORT:
+                short[] rowDataShort = ((DataBufferUShort) tileRowRaster.getDataBuffer()).getData();
+
+                for (int row = startRow; row < startRow + rowsInTile; row++) {
+                    if (row >= srcRegion.y + srcRegion.height) {
+                        break; // We're done with this tile
+                    }
+
+                    readFully(input, rowDataShort);
+
+                    if (row >= srcRegion.y) {
+                        normalizeBlack(interpretation, rowDataShort);
+
+                        // 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++) {
+                                    rowDataShort[x + b] = rowDataShort[x * xSub + b];
+                                }
+                            }
+                        }
+
+                        raster.setDataElements(startCol, row - srcRegion.y, tileRowRaster);
+                    }
+                    // Else skip data
+                }
+
+                break;
+            case DataBuffer.TYPE_INT:
+                int[] rowDataInt = ((DataBufferInt) tileRowRaster.getDataBuffer()).getData();
+
+                for (int row = startRow; row < startRow + rowsInTile; row++) {
+                    if (row >= srcRegion.y + srcRegion.height) {
+                        break; // We're done with this tile
+                    }
+
+                    readFully(input, rowDataInt);
+
+                    if (row >= srcRegion.y) {
+                        normalizeBlack(interpretation, rowDataInt);
+
+                        // 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++) {
+                                    rowDataInt[x + b] = rowDataInt[x * xSub + b];
+                                }
+                            }
+                        }
+
+                        raster.setDataElements(startCol, row - srcRegion.y, tileRowRaster);
+                    }
+                    // Else skip data
+                }
+
+                break;
+        }
+    }
+
+    // TODO: Candidate util method (with off/len + possibly byte order)
+    private void readFully(final DataInput input, final int[] rowDataInt) throws IOException {
+        if (input instanceof ImageInputStream) {
+            ImageInputStream imageInputStream = (ImageInputStream) input;
+            imageInputStream.readFully(rowDataInt, 0, rowDataInt.length);
+        }
+        else {
+            for (int k = 0; k < rowDataInt.length; k++) {
+                rowDataInt[k] = input.readInt();
+            }
+        }
+    }
+
+    // TODO: Candidate util method (with off/len + possibly byte order)
+    private void readFully(final DataInput input, final short[] rowDataShort) throws IOException {
+        if (input instanceof ImageInputStream) {
+            ImageInputStream imageInputStream = (ImageInputStream) input;
+            imageInputStream.readFully(rowDataShort, 0, rowDataShort.length);
+        }
+        else {
+            for (int k = 0; k < rowDataShort.length; k++) {
+                rowDataShort[k] = input.readShort();
+            }
+        }
+    }
+
+    private void normalizeBlack(int photometricInterpretation, short[] data) {
+        if (photometricInterpretation == 0 /*TIFFBaseline.PHOTOMETRIC_WHITE_IS_ZERO*/) {
+            // Inverse values
+            for (int i = 0; i < data.length; i++) {
+                data[i] = (short) (0xffff - data[i] & 0xffff);
+            }
+        }
+    }
+
+    private void normalizeBlack(int photometricInterpretation, int[] data) {
+        if (photometricInterpretation == 0 /*TIFFBaseline.PHOTOMETRIC_WHITE_IS_ZERO*/) {
+            // Inverse values
+            for (int i = 0; i < data.length; i++) {
+                data[i] = (0xffffffff - data[i]);
+            }
+        }
+    }
+
+    private void normalizeBlack(int photometricInterpretation, byte[] data) {
+        if (photometricInterpretation == 0/*TIFFBaseline.PHOTOMETRIC_WHITE_IS_ZERO*/) {
+            // Inverse values
+            for (int i = 0; i < data.length; i++) {
+                data[i] = (byte) (0xff - data[i] & 0xff);
+            }
+        }
+    }
+
+    private InputStream createDecompressorStream(final int compression, final int width, final InputStream stream) throws IOException {
+        switch (compression) {
+//            case TIFFBaseline.COMPRESSION_NONE:
+            case 1:
+                return stream;
+//            case TIFFBaseline.COMPRESSION_PACKBITS:
+//            case TIFFExtension.COMPRESSION_ZLIB:
+            case 8:
+                // TIFFphotoshop.pdf (aka TIFF specification, supplement 2) says ZLIB (8) and DEFLATE (32946) algorithms are identical
+                return new InflaterInputStream(stream, new Inflater(), 1024);
+            default:
+                throw new IllegalArgumentException("Unsupported TIFF compression: " + compression);
+        }
+    }
+
+    private InputStream createUnpredictorStream(final int predictor, final int width, final int samplesPerPixel, final int bitsPerSample, final InputStream stream, final ByteOrder byteOrder) throws IOException {
+        switch (predictor) {
+//            case TIFFBaseline.PREDICTOR_NONE:
+            case 1:
+                return stream;
+//            case TIFFExtension.PREDICTOR_HORIZONTAL_DIFFERENCING:
+            case 2:
+//                return new HorizontalDeDifferencingStream(stream, width, samplesPerPixel, bitsPerSample, byteOrder);
+//            case TIFFExtension.PREDICTOR_HORIZONTAL_FLOATINGPOINT:
+            case 3:
+                throw new IIOException("Unsupported TIFF Predictor value: " + predictor);
+            default:
+                throw new IIOException("Unknown TIFF Predictor value: " + predictor);
+        }
+    }
+}
+

imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderSpi.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.nef;
+
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
+
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.Locale;
+
+/**
+ * CR2ImageReaderSpi
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CR2ImageReaderSpi.java,v 1.0 07.04.14 21:26 haraldk Exp$
+ */
+public final class NEFImageReaderSpi extends ImageReaderSpiBase {
+    public NEFImageReaderSpi() {
+        super(new NEFProviderInfo());
+    }
+
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        if (!(pSource instanceof ImageInputStream)) {
+            return false;
+        }
+
+        ImageInputStream stream = (ImageInputStream) pSource;
+
+        stream.mark();
+        try {
+            byte[] bom = new byte[2];
+            stream.readFully(bom);
+
+            ByteOrder originalOrder = stream.getByteOrder();
+
+            try {
+                if (bom[0] == 'I' && bom[1] == 'I') {
+                    stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+                }
+                else if (bom[0] == 'M' && bom[1] == 'M') {
+                    stream.setByteOrder(ByteOrder.BIG_ENDIAN);
+                }
+                else  {
+                    return false;
+                }
+
+                int tiffMagic = stream.readUnsignedShort();
+                if (tiffMagic != TIFF.TIFF_MAGIC) {
+                    return false;
+                }
+
+                // TODO: This is not different from a normal TIFF...
+
+                return true;
+            }
+            finally {
+                stream.setByteOrder(originalOrder);
+            }
+        }
+        finally {
+            stream.reset();
+        }
+    }
+
+    @Override
+    public ImageReader createReaderInstance(Object extension) throws IOException {
+        return new NEFImageReader(this);
+    }
+
+    @Override
+    public String getDescription(Locale locale) {
+        return "Adobe Digital Negative (DNG) format Reader";
+    }
+}

imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFProviderInfo.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2018, Oleg Ermolaev
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.nef;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * @author Oleg Ermolaev Date: 04.05.2018 1:50
+ */
+class NEFProviderInfo extends ReaderWriterProviderInfo {
+    protected NEFProviderInfo() {
+        super(
+                NEFProviderInfo.class,
+                new String[]{"nef", "NEF"},
+                new String[]{"nef"},
+                new String[]{
+                        "image/x-nikon-nef",               // TODO: Look up
+                },
+                "com.twelvemonkeys.imageio.plugins.nef.NEFImageReader",
+                new String[]{"com.twelvemonkeys.imageio.plugins.nef.NEFImageReaderSpi"},
+                null,
+                null,
+                true,
+                null,
+                null,
+                null,
+                null,
+                true,
+                null,
+                null,
+                null,
+                null
+        );
+    }
+}

imageio/imageio-nef/src/test/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderTest.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2014, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.nef;
+
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import javax.imageio.ImageReader;
+import javax.imageio.spi.ImageReaderSpi;
+import java.awt.*;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * CR2ImageReaderTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: CR2ImageReaderTest.java,v 1.0 07.04.14 21:52 haraldk Exp$
+ */
+@Ignore
+public class NEFImageReaderTest extends ImageReaderAbstractTest<NEFImageReader> {
+    @Override
+    protected List<TestData> getTestData() {
+        return Arrays.asList(
+                new TestData(
+                        getClassLoaderResource("/nef/foo.nef"),
+                        new Dimension(2, 2)
+                )
+        );
+    }
+
+    @Override
+    protected ImageReaderSpi createProvider() {
+        return new NEFImageReaderSpi();
+    }
+
+    @Override
+    protected List<String> getFormatNames() {
+        return Arrays.asList("nef");
+    }
+
+    @Override
+    protected List<String> getSuffixes() {
+        return Arrays.asList("nef");
+    }
+
+    @Override
+    protected List<String> getMIMETypes() {
+        return Arrays.asList("image/x-nef");
+    }
+
+    @Test
+    @Ignore("Known issue: Subsampled reading not supported")
+    @Override
+    public void testReadWithSubsampleParamPixels() throws IOException {
+        super.testReadWithSubsampleParamPixels();
+    }
+
+    @Test
+    @Ignore("Known issue: Source region reading not supported")
+    @Override
+    public void testReadWithSourceRegionParamEqualImage() throws IOException {
+        super.testReadWithSourceRegionParamEqualImage();
+    }
+}

imageio/imageio-pcx/src/main/java/com/twelvemonkeys/imageio/plugins/pcx/PCXImageReader.java

@@ -104,15 +104,8 @@ public final class PCXImageReader extends ImageReaderBase {
         ImageTypeSpecifier rawType = getRawImageType(imageIndex);
 
         List<ImageTypeSpecifier> specifiers = new ArrayList<>();
-        if (rawType.getSampleModel() instanceof BandedSampleModel) {
-            if (rawType.getNumBands() == 3) {
-                specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR));
-            }
-            else if (rawType.getNumBands() == 4) {
-                specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_4BYTE_ABGR));
-                specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_4BYTE_ABGR_PRE));
-            }
-        }
+
+        // TODO: Implement
         specifiers.add(rawType);
 
         return specifiers.iterator();
@@ -149,10 +142,10 @@ public final class PCXImageReader extends ImageReaderBase {
                 // PCX RGB has channels for 24 bit RGB, will be validated by ImageTypeSpecifier
                 return ImageTypeSpecifiers.createBanded(ColorSpace.getInstance(ColorSpace.CS_sRGB), createIndices(channels, 1), createIndices(channels, 0), DataBuffer.TYPE_BYTE, channels == 4, false);
             case 24:
-                // Some sources say this is possible...
+                // Some sources says this is possible...
                 return ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR);
             case 32:
-                // Some sources say this is possible...
+                // Some sources says this is possible...
                 return ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_4BYTE_ABGR);
             default:
                 throw new IIOException("Unknown number of bytes per pixel: " + header.getBitsPerPixel());

imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/pcx/PCXImageReaderTest.java

@@ -78,7 +78,7 @@ public class PCXImageReaderTest extends ImageReaderAbstractTest<PCXImageReader>
                 new TestData(getClassLoaderResource("/pcx/DARKSTAR.PCX"), new Dimension(88, 52)), // RLE encoded monochrome (1 bps/1 channel)
                 new TestData(getClassLoaderResource("/pcx/MARBLES.PCX"), new Dimension(1419, 1001)), // RLE encoded RGB
                 new TestData(getClassLoaderResource("/pcx/no-palette-monochrome.pcx"), new Dimension(128, 152)), // RLE encoded monochrome (1 bps/1 channel)
-                // See cga-pcx.txt, however, the text seems to be in error, I don't see how the bits can be as described
+                // See cga-pcx.txt, however, the text seems to be in error, the bits can not not as described
                 new TestData(getClassLoaderResource("/pcx/CGA_BW.PCX"), new Dimension(640, 200)), // RLE encoded indexed (CGA mode)
                 new TestData(getClassLoaderResource("/pcx/CGA_FSD.PCX"), new Dimension(320, 200)), // RLE encoded indexed (CGA mode)
                 new TestData(getClassLoaderResource("/pcx/CGA_RGBI.PCX"), new Dimension(320, 200)), // RLE encoded indexed (CGA mode)

imageio/imageio-pnm/src/test/java/com/twelvemonkeys/imageio/plugins/pnm/PNMImageReaderTest.java

@@ -61,20 +61,6 @@ public class PNMImageReaderTest extends ImageReaderAbstractTest<PNMImageReader>
         );
     }
 
-    @Override
-    protected List<TestData> getTestDataForAffineTransformOpCompatibility() {
-        return Arrays.asList(
-                new TestData(getClassLoaderResource("/ppm/lena.ppm"), new Dimension(128, 128)),     // P6 (PPM RAW)
-                new TestData(getClassLoaderResource("/ppm/colors.ppm"), new Dimension(3, 2)),       // P3 (PPM PLAIN)
-                new TestData(getClassLoaderResource("/pbm/j.pbm"), new Dimension(6, 10)),           // P1 (PBM PLAIN)
-                new TestData(getClassLoaderResource("/pgm/feep.pgm"), new Dimension(24, 7)),        // P2 (PGM PLAIN)
-                new TestData(getClassLoaderResource("/pgm/feep16.pgm"), new Dimension(24, 7)),      // P2 (PGM PLAIN, 16 bits/sample)
-                new TestData(getClassLoaderResource("/pgm/house.l.pgm"), new Dimension(367, 241)),  // P5 (PGM RAW)
-                new TestData(getClassLoaderResource("/ppm/lighthouse_rgb48.ppm"), new Dimension(768, 512))  // P6 (PPM RAW, 16 bits/sample)
-                // "/pfm/memorial.pfm" uses floating point
-        );
-    }
-
     @Override
     protected List<String> getFormatNames() {
         return Arrays.asList(

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

@@ -331,7 +331,7 @@ public final class PSDImageReader extends ImageReaderBase {
                 // Just stick to the raw type
         }
 
-        // Finally, add the raw type
+        // Finally add the raw type
         types.add(rawType);
 
         return types.iterator();

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

@@ -86,6 +86,8 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
                 new TestData(getClassLoaderResource("/psd/test_gray16.psd"), new Dimension(710, 512)),
                 // 4 channel, CMYK, 16 bit samples
                 new TestData(getClassLoaderResource("/psd/cmyk_16bits.psd"), new Dimension(1000, 275)),
+                // 3 channel, RGB, 32 bit samples
+                new TestData(getClassLoaderResource("/psd/32bit5x5.psd"), new Dimension(5, 5)),
                 // 3 channel, RGB, 8 bit samples ("Large Document Format" aka PSB)
                 new TestData(getClassLoaderResource("/psb/test_original.psb"), new Dimension(710, 512)),
                 // From http://telegraphics.com.au/svn/psdparse/trunk/psd/
@@ -102,48 +104,11 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
                 new TestData(getClassLoaderResource("/psd/rgb-multichannel-no-transparency.psd"), new Dimension(100, 100)),
                 new TestData(getClassLoaderResource("/psb/rgb-multichannel-no-transparency.psb"), new Dimension(100, 100)),
                 // CMYK, uncompressed + contains some uncommon MeSa (instead of 8BIM) resource blocks
-                new TestData(getClassLoaderResource("/psd/fruit-cmyk-MeSa-resource.psd"), new Dimension(400, 191)),
-                // 3 channel, RGB, 32 bit samples
-                new TestData(getClassLoaderResource("/psd/32bit5x5.psd"), new Dimension(5, 5))
+                new TestData(getClassLoaderResource("/psd/fruit-cmyk-MeSa-resource.psd"), new Dimension(400, 191))
                 // TODO: Need more recent ZIP compressed PSD files from CS2/CS3+
         );
     }
 
-    @Override
-    protected List<TestData> getTestDataForAffineTransformOpCompatibility() {
-        return Arrays.asList(
-                // 5 channel, RGB
-                new TestData(getClassLoaderResource("/psd/photoshopping.psd"), new Dimension(300, 225)),
-                // 1 channel, gray, 8 bit samples
-                new TestData(getClassLoaderResource("/psd/buttons.psd"), new Dimension(20, 20)),
-                // 3 channel RGB, "no composite layer"
-                new TestData(getClassLoaderResource("/psd/jugware-icon.psd"), new Dimension(128, 128)),
-                // 3 channel RGB, old data, no layer info/mask
-                new TestData(getClassLoaderResource("/psd/MARBLES.PSD"), new Dimension(1419, 1001)),
-                // 1 channel, indexed color
-                new TestData(getClassLoaderResource("/psd/coral_fish.psd"), new Dimension(800, 800)),
-                // 1 channel, bitmap, 1 bit samples
-                new TestData(getClassLoaderResource("/psd/test_bitmap.psd"), new Dimension(710, 512)),
-                // 1 channel, gray, 16 bit samples
-                new TestData(getClassLoaderResource("/psd/test_gray16.psd"), new Dimension(710, 512)),
-                // 3 channel, RGB, 8 bit samples ("Large Document Format" aka PSB)
-                new TestData(getClassLoaderResource("/psb/test_original.psb"), new Dimension(710, 512)),
-                // From http://telegraphics.com.au/svn/psdparse/trunk/psd/
-                new TestData(getClassLoaderResource("/psd/adobehq.psd"), new Dimension(341, 512)),
-                new TestData(getClassLoaderResource("/psd/adobehq_ind.psd"), new Dimension(341, 512)),
-                // Contains a shorter than normal PrintFlags chunk
-                new TestData(getClassLoaderResource("/psd/adobehq-2.5.psd"), new Dimension(341, 512)),
-                new TestData(getClassLoaderResource("/psd/adobehq-3.0.psd"), new Dimension(341, 512)),
-                new TestData(getClassLoaderResource("/psd/adobehq-5.5.psd"), new Dimension(341, 512)),
-                new TestData(getClassLoaderResource("/psd/adobehq-7.0.psd"), new Dimension(341, 512)),
-                // From https://github.com/kmike/psd-tools/tree/master/tests/psd_files
-                new TestData(getClassLoaderResource("/psd/masks2.psd"), new Dimension(640, 1136)),
-                // RGB, multiple alpha channels, no transparency
-                new TestData(getClassLoaderResource("/psd/rgb-multichannel-no-transparency.psd"), new Dimension(100, 100)),
-                new TestData(getClassLoaderResource("/psb/rgb-multichannel-no-transparency.psb"), new Dimension(100, 100))
-        );
-    }
-
     @Override
     protected List<String> getFormatNames() {
         return Collections.singletonList("psd");
@@ -507,7 +472,7 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
     public void testMultiChannelNoTransparencyPSB() throws IOException {
         PSDImageReader imageReader = createReader();
 
-        // The following PSB is RGB, has 4 channels (1 alpha/auxiliary channel), but should be treated as opaque
+        // The following PSB is RGB, has 4 channels (1 alpha/auxillary channel), but should be treated as opaque
         try (ImageInputStream stream = ImageIO.createImageInputStream(getClassLoaderResource("/psb/rgb-multichannel-no-transparency.psb"))) {
             imageReader.setInput(stream);
 

imageio/imageio-sgi/src/main/java/com/twelvemonkeys/imageio/plugins/sgi/SGIImageReader.java

@@ -59,7 +59,7 @@ public final class SGIImageReader extends ImageReaderBase {
 
     private SGIHeader header;
 
-    SGIImageReader(final ImageReaderSpi provider) {
+    protected SGIImageReader(final ImageReaderSpi provider) {
         super(provider);
     }
 
@@ -88,31 +88,9 @@ public final class SGIImageReader extends ImageReaderBase {
     public Iterator<ImageTypeSpecifier> getImageTypes(final int imageIndex) throws IOException {
         ImageTypeSpecifier rawType = getRawImageType(imageIndex);
 
-        List<ImageTypeSpecifier> specifiers = new ArrayList<>();
-
-        int channels = header.getChannels();
-
-        switch (header.getBytesPerPixel()) {
-            case 1:
-                if (channels == 1) {
-                    specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY));
-                }
-                else if (channels == 3) {
-                    specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR));
-                }
-                else if (channels == 4) {
-                    specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_4BYTE_ABGR));
-                }
-
-                break;
-            case 2:
-                if (channels == 1) {
-                    specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_USHORT_GRAY));
-                }
-
-                break;
-        }
+        List<ImageTypeSpecifier> specifiers = new ArrayList<ImageTypeSpecifier>();
 
+        // TODO: Implement
         specifiers.add(rawType);
 
         return specifiers.iterator();

imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAImageReader.java

@@ -96,17 +96,9 @@ final class TGAImageReader extends ImageReaderBase {
         ImageTypeSpecifier rawType = getRawImageType(imageIndex);
 
         List<ImageTypeSpecifier> specifiers = new ArrayList<>();
-        specifiers.add(rawType);
 
-        if (rawType.getBufferedImageType() == BufferedImage.TYPE_INT_RGB) {
-            specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_BGR));
-        }
-        else if (rawType.getBufferedImageType() == BufferedImage.TYPE_INT_ARGB) {
-            specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_ARGB_PRE));
-        }
-        else if (rawType.getBufferedImageType() == BufferedImage.TYPE_INT_ARGB_PRE) {
-            specifiers.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_ARGB));
-        }
+        // TODO: Implement
+        specifiers.add(rawType);
 
         return specifiers.iterator();
     }
@@ -124,14 +116,7 @@ final class TGAImageReader extends ImageReaderBase {
                 return ImageTypeSpecifiers.createFromIndexColorModel(header.getColorMap());
             case TGA.IMAGETYPE_MONOCHROME:
             case TGA.IMAGETYPE_MONOCHROME_RLE:
-                switch (header.getPixelDepth()) {
-                    case 8:
-                        return ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY);
-                    case 16:
-                        return ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_USHORT_GRAY);
-                    default:
-                        throw new IIOException("Unknown pixel depth for monochrome: " + header.getPixelDepth());
-                }
+                return ImageTypeSpecifiers.createGrayscale(8, DataBuffer.TYPE_BYTE);
             case TGA.IMAGETYPE_TRUECOLOR:
             case TGA.IMAGETYPE_TRUECOLOR_RLE:
                 ColorSpace sRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB);
@@ -150,14 +135,12 @@ final class TGAImageReader extends ImageReaderBase {
                     case 24:
                         return ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR);
                     case 32:
-                        // NOTE: We'll read using little endian byte order, thus the file layout is BGRA/BGRx
-                        if (hasAlpha) {
-                            return ImageTypeSpecifier.createFromBufferedImageType(isAlphaPremultiplied ? BufferedImage.TYPE_INT_ARGB_PRE : BufferedImage.TYPE_INT_ARGB);
-                        }
-
-                        return ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB);
+                        // 4BYTE_BGRX...
+                        // Can't mask out alpha (efficiently) for 4BYTE, so we'll ignore it while reading instead,
+                        // if hasAlpha is false
+                        return ImageTypeSpecifiers.createInterleaved(sRGB, new int[] {2, 1, 0, 3}, DataBuffer.TYPE_BYTE, true, isAlphaPremultiplied);
                     default:
-                        throw new IIOException("Unknown pixel depth for true color: " + header.getPixelDepth());
+                        throw new IIOException("Unknown pixel depth for truecolor: " + header.getPixelDepth());
                 }
             default:
                 throw new IIOException("Unknown image type: " + header.getImageType());
@@ -204,26 +187,20 @@ final class TGAImageReader extends ImageReaderBase {
             input = imageInput;
         }
 
-        int pixelDepth = header.getPixelDepth();
-        boolean flipped = isOriginLowerLeft(header.getOrigin());
-
         for (int y = 0; y < height; y++) {
-            switch (pixelDepth) {
+            switch (header.getPixelDepth()) {
                 case 8:
                 case 24:
+                case 32:
                     byte[] rowDataByte = ((DataBufferByte) rowRaster.getDataBuffer()).getData();
-                    readRowByte(input, height, srcRegion, flipped, xSub, ySub, rowDataByte, destRaster, clippedRow, y);
+                    readRowByte(input, height, srcRegion, header.getOrigin(), xSub, ySub, rowDataByte, destRaster, clippedRow, y);
                     break;
                 case 16:
                     short[] rowDataUShort = ((DataBufferUShort) rowRaster.getDataBuffer()).getData();
-                    readRowUShort(input, height, srcRegion, flipped, xSub, ySub, rowDataUShort, destRaster, clippedRow, y);
-                    break;
-                case 32:
-                    int[] rowDataInt = ((DataBufferInt) rowRaster.getDataBuffer()).getData();
-                    readRowInt(input, height, srcRegion, flipped, xSub, ySub, rowDataInt, destRaster, clippedRow, y);
+                    readRowUShort(input, height, srcRegion, header.getOrigin(), xSub, ySub, rowDataUShort, destRaster, clippedRow, y);
                     break;
                 default:
-                    throw new AssertionError("Unsupported pixel depth: " + pixelDepth);
+                    throw new AssertionError("Unsupported pixel depth: " + header.getPixelDepth());
             }
 
             processImageProgress(100f * y / height);
@@ -243,26 +220,10 @@ final class TGAImageReader extends ImageReaderBase {
         return destination;
     }
 
-    private boolean isOriginLowerLeft(final int origin) throws IIOException {
-        switch (origin) {
-            case TGA.ORIGIN_LOWER_LEFT:
-                return true;
-            case TGA.ORIGIN_UPPER_LEFT:
-                return false;
-            default:
-                // Other orientations are not supported
-                throw new IIOException("Unsupported origin: " + origin);
-        }
-    }
-
-    private void readRowByte(final DataInput input, int height, Rectangle srcRegion, boolean flip, int xSub, int ySub,
+    private void readRowByte(final DataInput input, int height, Rectangle srcRegion, int origin, int xSub, int ySub,
                              byte[] rowDataByte, WritableRaster destChannel, Raster srcChannel, int y) throws IOException {
-        // Flip into position?
-        int srcY = flip ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
         // If subsampled or outside source region, skip entire row
-        if (y % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
             input.skipBytes(rowDataByte.length);
 
             return;
@@ -283,7 +244,19 @@ final class TGAImageReader extends ImageReaderBase {
             }
         }
 
-        destChannel.setDataElements(0, dstY, srcChannel);
+        switch (origin) {
+            case TGA.ORIGIN_LOWER_LEFT:
+                // Flip into position
+                int dstY = (height - 1 - y - srcRegion.y) / ySub;
+                destChannel.setDataElements(0, dstY, srcChannel);
+                break;
+            case TGA.ORIGIN_UPPER_LEFT:
+                dstY = y / ySub;
+                destChannel.setDataElements(0, dstY, srcChannel);
+                break;
+            default:
+                throw new IIOException("Unsupported origin: " + origin);
+        }
     }
 
     private void removeAlpha32(final byte[] rowData) {
@@ -292,14 +265,10 @@ final class TGAImageReader extends ImageReaderBase {
         }
     }
 
-    private void readRowUShort(final DataInput input, int height, Rectangle srcRegion, boolean flip, int xSub, int ySub,
+    private void readRowUShort(final DataInput input, int height, Rectangle srcRegion, int origin, int xSub, int ySub,
                                short[] rowDataUShort, WritableRaster destChannel, Raster srcChannel, int y) throws IOException {
-        // Flip into position?
-        int srcY = flip ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
         // If subsampled or outside source region, skip entire row
-        if (y % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
             input.skipBytes(rowDataUShort.length * 2);
 
             return;
@@ -314,32 +283,19 @@ final class TGAImageReader extends ImageReaderBase {
             }
         }
 
-        destChannel.setDataElements(0, dstY, srcChannel);
-    }
-
-    private void readRowInt(final DataInput input, int height, Rectangle srcRegion, boolean flip, int xSub, int ySub,
-                            int[] rowDataInt, WritableRaster destChannel, Raster srcChannel, int y) throws IOException {
-        // Flip into position?
-        int srcY = flip ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
-        // If subsampled or outside source region, skip entire row
-        if (y % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
-            input.skipBytes(rowDataInt.length * 4);
-
-            return;
+        switch (origin) {
+            case TGA.ORIGIN_LOWER_LEFT:
+                // Flip into position
+                int dstY = (height - 1 - y - srcRegion.y) / ySub;
+                destChannel.setDataElements(0, dstY, srcChannel);
+                break;
+            case TGA.ORIGIN_UPPER_LEFT:
+                dstY = y / ySub;
+                destChannel.setDataElements(0, dstY, srcChannel);
+                break;
+            default:
+                throw new IIOException("Unsupported origin: " + origin);
         }
-
-        readFully(input, rowDataInt);
-
-        // Subsample horizontal
-        if (xSub != 1) {
-            for (int x = srcRegion.x / xSub; x < ((srcRegion.x + srcRegion.width) / xSub); x++) {
-                rowDataInt[x] = rowDataInt[x * xSub];
-            }
-        }
-
-        destChannel.setDataElements(0, dstY, srcChannel);
     }
 
     // TODO: Candidate util method
@@ -355,19 +311,6 @@ final class TGAImageReader extends ImageReaderBase {
         }
     }
 
-    // TODO: Candidate util method
-    private static void readFully(final DataInput input, final int[] ints) throws IOException {
-        if (input instanceof ImageInputStream) {
-            // Optimization for ImageInputStreams, read all in one go
-            ((ImageInputStream) input).readFully(ints, 0, ints.length);
-        }
-        else {
-            for (int i = 0; i < ints.length; i++) {
-                ints[i] = input.readInt();
-            }
-        }
-    }
-
     private Raster clipRowToRect(final Raster raster, final Rectangle rect, final int[] bands, final int xSub) {
         if (rect.contains(raster.getMinX(), 0, raster.getWidth(), 1)
                 && xSub == 1
@@ -503,26 +446,20 @@ final class TGAImageReader extends ImageReaderBase {
         // Thumbnail is always stored non-compressed, no need for RLE support
         imageInput.seek(extensions.getThumbnailOffset() + 2);
 
-        int pixelDepth = header.getPixelDepth();
-        boolean flipped = isOriginLowerLeft(header.getOrigin());
-
         for (int y = 0; y < height; y++) {
-            switch (pixelDepth) {
+            switch (header.getPixelDepth()) {
                 case 8:
                 case 24:
+                case 32:
                     byte[] rowDataByte = ((DataBufferByte) rowRaster.getDataBuffer()).getData();
-                    readRowByte(imageInput, height, srcRegion, flipped, 1, 1, rowDataByte, destRaster, rowRaster, y);
+                    readRowByte(imageInput, height, srcRegion, header.getOrigin(), 1, 1, rowDataByte, destRaster, rowRaster, y);
                     break;
                 case 16:
                     short[] rowDataUShort = ((DataBufferUShort) rowRaster.getDataBuffer()).getData();
-                    readRowUShort(imageInput, height, srcRegion, flipped, 1, 1, rowDataUShort, destRaster, rowRaster, y);
-                    break;
-                case 32:
-                    int[] rowDataInt = ((DataBufferInt) rowRaster.getDataBuffer()).getData();
-                    readRowInt(imageInput, height, srcRegion, flipped, 1, 1, rowDataInt, destRaster, rowRaster, y);
+                    readRowUShort(imageInput, height, srcRegion, header.getOrigin(), 1, 1, rowDataUShort, destRaster, rowRaster, y);
                     break;
                 default:
-                    throw new AssertionError("Unsupported pixel depth: " + pixelDepth);
+                    throw new AssertionError("Unsupported pixel depth: " + header.getPixelDepth());
             }
 
             processThumbnailProgress(100f * y / height);

imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java

@@ -193,13 +193,10 @@ final class TGAMetadata extends AbstractMetadata {
 
         switch (header.getPixelDepth()) {
             case 8:
-                bitsPerSample.setAttribute("value", createListValue(1, "8"));
+                bitsPerSample.setAttribute("value", createListValue(1, Integer.toString(header.getPixelDepth())));
                 break;
             case 16:
-                if (header.getImageType() == TGA.IMAGETYPE_MONOCHROME || header.getImageType() == TGA.IMAGETYPE_MONOCHROME_RLE) {
-                    bitsPerSample.setAttribute("value", "16");
-                }
-                else if (header.getAttributeBits() > 0 && extensions != null && extensions.hasAlpha()) {
+                if (header.getAttributeBits() > 0 && extensions != null && extensions.hasAlpha()) {
                     bitsPerSample.setAttribute("value", "5, 5, 5, 1");
                 }
                 else {

imageio/imageio-tga/src/test/java/com/twelvemonkeys/imageio/plugins/tga/TGAImageReaderTest.java

@@ -91,10 +91,7 @@ public class TGAImageReaderTest extends ImageReaderAbstractTest<TGAImageReader>
                 new TestData(getClassLoaderResource("/tga/XING_T24.TGA"), new Dimension(240, 164)), // Uncompressed 24 bit BGR top/down
                 new TestData(getClassLoaderResource("/tga/XING_T32.TGA"), new Dimension(240, 164)), // Uncompressed 32 bit BGRA top/down
 
-                new TestData(getClassLoaderResource("/tga/autodesk-3dsmax-extsize494.tga"), new Dimension(440, 200)),  // RLE compressed 32 bit BGRA bottom/up
-
-                new TestData(getClassLoaderResource("/tga/monochrome16_top_left.tga"), new Dimension(64, 64)),  // Uncompressed 16 bit monochrome
-                new TestData(getClassLoaderResource("/tga/monochrome16_top_left_rle.tga"), new Dimension(64, 64))  // RLE compressed 16 bit monochrome
+                new TestData(getClassLoaderResource("/tga/autodesk-3dsmax-extsize494.tga"), new Dimension(440, 200))  // RLE compressed 32 bit BGRA bottom/up
         );
     }
 

imageio/imageio-tiff-jai-interop/pom.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.twelvemonkeys.imageio</groupId>
-        <artifactId>imageio</artifactId>
-        <version>3.8.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>imageio-tiff-jai-interop</artifactId>
-    <name>TwelveMonkeys :: ImageIO :: TIFF/JAI Metadata Interop</name>
-    <description>
-        Test TIFF plugin and JAI TIFF plugin Metadata interoperability
-    </description>
-
-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.tiff.jaiinterop</project.jpms.module.name>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.github.jai-imageio</groupId>
-            <artifactId>jai-imageio-core</artifactId>
-            <version>1.4.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>imageio-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>imageio-core</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>imageio-metadata</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>imageio-tiff</artifactId>
-        </dependency>
-    </dependencies>
-</project>

imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java

@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2021, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.plugins.tiff.jaiinterop;
-
-import com.twelvemonkeys.imageio.metadata.tiff.Rational;
-import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
-import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
-import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata;
-
-import org.junit.Test;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.ImageWriter;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataFormatImpl;
-import javax.imageio.metadata.IIOMetadataNode;
-import java.awt.image.BufferedImage;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-/**
- * Tests our TIFFImageMetadata works with JAI TIFFImageWriter.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: TIFFImageReaderJDKJPEGInteroperabilityTest.java,v 1.0 08.05.12 15:25 haraldk Exp$
- */
-public class TIFFImageMetadataJAInteroperabilityTest {
-    private static final String JAI_TIFF_PROVIDER_CLASS_NAME = "com.github.jaiimageio.impl.plugins.tiff.TIFFImageWriterSpi";
-
-    private ImageWriter createImageWriter() {
-        Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("TIFF");
-
-        while (writers.hasNext()) {
-            ImageWriter writer = writers.next();
-
-            if (JAI_TIFF_PROVIDER_CLASS_NAME.equals(writer.getOriginatingProvider().getClass().getName())) {
-                return writer;
-            }
-        }
-
-        throw new AssertionError("Expected Spi not found (dependency issue?): " + JAI_TIFF_PROVIDER_CLASS_NAME);
-    }
-
-
-    @Test
-    public void testRationalNeedsDenominator() {
-        // Set the resolution to 200 dpi
-        IIOMetadata ourMetadata = new TIFFImageMetadata(Arrays.asList(new TIFFEntry(TIFF.TAG_RESOLUTION_UNIT, 2), // Unit DPI (default)
-                                                                      new TIFFEntry(TIFF.TAG_X_RESOLUTION, new Rational(200)),
-                                                                      new TIFFEntry(TIFF.TAG_Y_RESOLUTION, new Rational(200))));
-
-        ImageTypeSpecifier type = ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY);
-        ImageWriter writer = createImageWriter();
-        IIOMetadata converted = writer.convertImageMetadata(ourMetadata, type, null);
-
-        assertNotNull(converted);
-
-        // Make sure we have x/y resolution in converted metadata
-        IIOMetadataNode standardTree = (IIOMetadataNode) converted.getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName);
-        String horizontalPixelSize = ((IIOMetadataNode) standardTree.getElementsByTagName("HorizontalPixelSize").item(0)).getAttribute("value");
-        String verticalPixelSize = ((IIOMetadataNode) standardTree.getElementsByTagName("VerticalPixelSize").item(0)).getAttribute("value");
-
-        // For some reason this is *pixel size* in *mm*...
-        String expected = String.valueOf(2.54 / 200 * 10);
-        assertEquals(expected, horizontalPixelSize);
-        assertEquals(expected, verticalPixelSize);
-    }
-}