[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release twelvemonkeys-3.2.1
Updated versions and fixed Batik depdendencies for 1.6.1
2026-05-01 00:00:02 -04:00 · 2015-12-11 12:33:14 +01:00 · 2015-12-11 12:33:08 +01:00 · 2015-12-04 23:27:23 +01:00 · 2015-12-04 21:26:41 +01:00 · 2015-12-04 21:26:34 +01:00
185 changed files with 8777 additions and 1897 deletions
@@ -0,0 +1,6 @@
+language: java
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+# Some JPEGImageReader tests fail on OpenJDK, need to investigate/fix before enabling
+#  - openjdk7
@@ -1,6 +1,8 @@
 ## Latest

-TwelveMonkeys ImageIO 3.0.2 is released.
+Master branch build status: [![Build Status](https://travis-ci.org/haraldk/TwelveMonkeys.svg?branch=master)](https://travis-ci.org/haraldk/TwelveMonkeys)
+
+TwelveMonkeys ImageIO [3.2](http://search.maven.org/#search%7Cga%7C1%7Cg%3Acom.twelvemonkeys*%20AND%20v%3A%223.2%22) is released (Nov. 1st, 2015).

 ## About

@@ -20,7 +22,7 @@ The goal is to create a set of efficient and robust ImageIO plug-ins, that can b

 Mainstream format support

-#### MS Windows/IBM OS/2 Device Independent Bitmap (BMP) *3.1*
+#### BMP - MS Windows/IBM OS/2 Device Independent Bitmap
 
 * Read support for all known versions of the DIB/BMP format
  * Indexed color, 1, 4 and 8 bit, including 4 and 8 bit RLE
@@ -32,6 +34,8 @@ Mainstream format support
 #### JPEG

 * Read support for the following JPEG "flavors":
+  * All JFIF compliant JPEGs
+  * All Exif compliant JPEGs
  * YCbCr JPEGs without JFIF segment (converted to RGB, using embedded ICC profile)
  * CMYK JPEGs (converted to RGB by default or as CMYK, using embedded ICC profile)
  * Adobe YCCK JPEGs (converted to RGB by default or as CMYK, using embedded ICC profile)
@@ -65,7 +69,7 @@ without success so far).

 Alternatively, if you have or know of a JPEG-2000 implementation in Java with a suitable license, get in touch. :-)

-#### NetPBM Portable Any Map (PNM) *3.1*
+#### PNM - NetPBM Portable Any Map

 * Read support for the following file types:
  * PBM in 'P1' (ASCII) and 'P4' (binary) formats, 1 bit per pixel
@@ -78,7 +82,7 @@ Alternatively, if you have or know of a JPEG-2000 implementation in Java with a
  * PAM in 'P7' (binary) format
 * Standard metadata support

-#### Adobe Photoshop Document (PSD)
+#### PSD - Adobe Photoshop Document

 * Read support for the following file types:
  * Monochrome, 1 channel, 1 bit
@@ -89,16 +93,16 @@ Alternatively, if you have or know of a JPEG-2000 implementation in Java with a
  * CMYK, 4-5 channels, 8, 16 and 32 bit
 * Read support for the following compression types:
  * Uncompressed
-  * RLE (PackBits)
+  * RLE (PackBits)<
 * Layer support
  * Image layers only, in all of the above types
 * Thumbnail support
  * JPEG
  * RAW (RGB)
 * Support for "Large Document Format" (PSB)
-* Native metadata support
+* Native and Standard metadata support

-#### Aldus/Adobe Tagged Image File Format (TIFF)
+#### TIFF - Aldus/Adobe Tagged Image File Format

 * Read support for the following "Baseline" TIFF file types:
  * Class B (Bi-level), all relevant compression types, 1 bit per sample
@@ -107,30 +111,42 @@ Alternatively, if you have or know of a JPEG-2000 implementation in Java with a
  * Class R (RGB), all relevant compression types, 8 or 16 bits per sample, unsigned integer
 * Read support for the following TIFF extensions:
  * Tiling
+  * Class F (Facsimile), CCITT Modified Huffman RLE, T4 and T6 (type 2, 3 and 4) compressions.
  * LZW Compression (type 5)
  * "Old-style" JPEG Compression (type 6), as a best effort, as the spec is not well-defined
  * JPEG Compression (type 7)
  * ZLib (aka Adobe-style Deflate) Compression (type 8)
  * Deflate Compression (type 32946)
  * Horizontal differencing Predictor (type 2) for LZW, ZLib, Deflate and PackBits compression
-  * Alpha channel (ExtraSamples type 1/Associated Alpha)
+  * Alpha channel (ExtraSamples type 1/Associated Alpha and type 2/Unassociated Alpha)
  * CMYK data (PhotometricInterpretation type 5/Separated)
  * YCbCr data (PhotometricInterpretation type 6/YCbCr) for JPEG
+  * CIELab data in TIFF, ITU and ICC variants (PhotometricInterpretation type 9, 10 and 11)
  * Planar data (PlanarConfiguration type 2/Planar)
  * ICC profiles (ICCProfile)
  * BitsPerSample values up to 16 for most PhotometricInterpretations
  * Multiple images (pages) in one file
 * Write support for most "Baseline" TIFF options
  * Uncompressed, PackBits, ZLib and Deflate 
-  * Currently missing the CCITT fax encodings
+  * Additional support for CCITT T4 and and T6 compressions.
  * Additional support for LZW and JPEG (type 7) compressions
  * Horizontal differencing Predictor (type 2) for LZW, ZLib, Deflate
+* Native and Standard metadata support

 Legacy formats

-#### Commodore Amiga/Electronic Arts Interchange File Format (IFF)
+#### HDR - Radiance High Dynamic Range RGBE Format

-* Legacy format, allows reading popular image from the Commodore Amiga computer.
+* Read support for the most common RGBE (.hdr) format
+* Samples are converted to 32 bit floating point (`float`) and normalized using a global tone mapper by default.
+  * Support for custom global tone mappers
+  * Alternatively, use a "null-tone mapper", for unnormalized data (allows local tone mapping)
+* Unconverted RGBE samples accessible using `readRaster`
+* Standard metadata support
+
+#### IFF - Commodore Amiga/Electronic Arts Interchange File Format
+
+* Legacy format, allows reading popular image format from the Commodore Amiga computer.
 * Read support for the following file types:
  * ILBM Indexed color, 1-8 interleaved bit planes, including 6 bit EHB
  * ILBM  Gray, 8 bit interleaved bit planes
@@ -146,7 +162,7 @@ Legacy formats
  * Uncompressed
  * RLE (PackBits)

-#### ZSoft Paintbrush Format (PCX) *3.1*
+#### PCX - ZSoft Paintbrush Format

 * Read support for the following file types:
  * Indexed color, 1, 2, 4 or 8 bits per pixel, bit planes or interleaved
@@ -158,7 +174,7 @@ Legacy formats
  * RLE compressed
 * Standard metadata support

-#### Apple Mac Paint Picture Format (PICT)
+#### PICT - Apple Mac Paint Picture Format

 * Legacy format, especially useful for reading OS X clipboard data.
 * Read support for the following file types:
@@ -169,7 +185,7 @@ Legacy formats
 * Write support for RGB pixel data:
  * QuickDraw pixmap

-#### Silicon Graphics Image Format (SGI) *3.1*
+#### SGI - Silicon Graphics Image Format

 * Read support for the following file types:
  * 1, 2, 3 or 4 channel image data
@@ -179,7 +195,7 @@ Legacy formats
  * RLE compressed
 * Standard metadata support

-#### Truevision TGA Image Format (TGA) *3.1*
+#### TGA - Truevision TGA Image Format

 * Read support for the following file types:
  * ColorMapped
@@ -192,35 +208,39 @@ Legacy formats

 Icon/other formats

-#### Apple Icon Image (ICNS)
+#### ICNS - Apple Icon Image

 * Read support for the following icon types:
  * All known "native" icon types
  * Large PNG encoded icons
  * Large JPEG 2000 encoded icons (requires JPEG 2000 ImageIO plugin or fallback to `sips` command line tool)

-#### MS Windows Icon and Cursor Formats (ICO & CUR)
+#### ICO & CUR - MS Windows Icon and Cursor Formats

 * Read support for the following file types:
  * ICO Indexed color, 1, 4 and 8 bit
  * ICO RGB, 16, 24 and 32 bit
  * CUR Indexed color, 1, 4 and 8 bit
  * CUR RGB, 16, 24 and 32 bit
+* *3.1* Note: These formats are now part of the BMP plugin

-#### MS Windows Thumbs DB (Thumbs.db)
+#### Thumbs.db - MS Windows Thumbs DB

 * Read support

 Other formats, using 3rd party libraries

-#### Scalable Vector Graphics (SVG)
+#### SVG - Scalable Vector Graphics

 * Read-only support using Batik

-#### MS Windows MetaFile (WMF)
+#### WMF - MS Windows MetaFile

 * Limited read-only support using Batik

+**Important note on using Batik:** *Please read [The Apache™ XML Graphics Project - Security](http://xmlgraphics.apache.org/security.html), and make sure you use
+either version 1.6.1, 1.7.1 or 1.8+.*
+

 ## Basic usage

@@ -419,9 +439,9 @@ Build the project (using [Maven](http://maven.apache.org/download.cgi)):

    $ mvn package

-Currently, the only supported JDK for making a build is Oracle JDK 7.x. 
+Currently, the recommended JDK for making a build is Oracle JDK 7.x or 8.x. 

-It's possible to build using OpenJDK, but some tests will fail due to some minor differences between the color management systems used. You will need to either disable the tests in question, or build without tests altogether. To build using JDK 8, you need to pass `-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider` to revert to the color manangement system used in Java 7.
+It's possible to build using OpenJDK, but some tests might fail due to some minor differences between the color management systems used. You will need to either disable the tests in question, or build without tests altogether.

 Because the unit tests needs quite a bit of memory to run, you might have to set the environment variable `MAVEN_OPTS`
 to give the Java process that runs Maven more memory. I suggest something like `-Xmx512m -XX:MaxPermSize=256m`.
@@ -459,12 +479,12 @@ To depend on the JPEG and TIFF plugin using Maven, add the following to your POM
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-jpeg</artifactId>
-            <version>3.0.2</version> <!-- Alternatively, build your own version -->
+            <version>3.2</version> <!-- Alternatively, build your own version -->
        </dependency>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-tiff</artifactId>
-            <version>3.0.2</version> <!-- Alternatively, build your own version -->
+            <version>3.2</version> <!-- Alternatively, build your own version -->
        </dependency>
    </dependencies>

@@ -472,25 +492,66 @@ To depend on the JPEG and TIFF plugin using Maven, add the following to your POM

 To depend on the JPEG and TIFF plugin in your IDE or program, add all of the following JARs to your class path:

-    twelvemonkeys-common-lang-3.0.2.jar
-    twelvemonkeys-common-io-3.0.2.jar
-    twelvemonkeys-common-image-3.0.2.jar
-    twelvemonkeys-imageio-core-3.0.2.jar
-    twelvemonkeys-imageio-metadata-3.0.2.jar
-    twelvemonkeys-imageio-jpeg-3.0.2.jar
-    twelvemonkeys-imageio-tiff-3.0.2.jar
+    twelvemonkeys-common-lang-3.2.jar
+    twelvemonkeys-common-io-3.2.jar
+    twelvemonkeys-common-image-3.2.jar
+    twelvemonkeys-imageio-core-3.2.jar
+    twelvemonkeys-imageio-metadata-3.2.jar
+    twelvemonkeys-imageio-jpeg-3.2.jar
+    twelvemonkeys-imageio-tiff-3.2.jar

 ### Links to prebuilt binaries

+##### Latest version (3.2.x)
+
+Requires Java 7 or later.
+ 
+Common dependencies
+* [common-lang-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.2/common-lang-3.2.jar)
+* [common-io-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.2/common-io-3.2.jar)
+* [common-image-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.2/common-image-3.2.jar)
+
+ImageIO dependencies
+* [imageio-core-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.2/imageio-core-3.2.jar)
+* [imageio-metadata-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.2/imageio-metadata-3.2.jar)
+
+ImageIO plugins
+* [imageio-bmp-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.2/imageio-bmp-3.2.jar)
+* [imageio-jpeg-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.2/imageio-jpeg-3.2.jar)
+* [imageio-tiff-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.2/imageio-tiff-3.2.jar)
+* [imageio-pnm-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.2/imageio-pnm-3.2.jar)
+* [imageio-psd-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.2/imageio-psd-3.2.jar)
+* [imageio-hdr-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.2/imageio-hdr-3.2.jar)
+* [imageio-iff-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.2/imageio-iff-3.2.jar)
+* [imageio-pcx-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.2/imageio-pcx-3.2.jar)
+* [imageio-pict-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.2/imageio-pict-3.2.jar)
+* [imageio-sgi-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.2/imageio-sgi-3.2.jar)
+* [imageio-tga-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.2/imageio-tga-3.2.jar)
+* [imageio-icns-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.2/imageio-icns-3.2.jar)
+* [imageio-thumbsdb-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.2/imageio-thumbsdb-3.2.jar)
+
+ImageIO plugins requiring 3rd party libs
+* [imageio-batik-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.2/imageio-batik-3.2.jar)
+
+Photoshop Path support for ImageIO
+* [imageio-clippath-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.2/imageio-clippath-3.2.jar)
+
+Servlet support
+* [servlet-3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.2/servlet-3.2.jar)
+
+##### Old version (3.0.x)
+
+Use this version for projects that requires Java 6 or need the JMagick support. *Does not support Java 8*. 
+
 Common dependencies
 * [common-lang-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.0.2/common-lang-3.0.2.jar)
 * [common-io-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.0.2/common-io-3.0.2.jar)
 * [common-image-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.0.2/common-image-3.0.2.jar)
-
+ 
 ImageIO dependencies
 * [imageio-core-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.0.2/imageio-core-3.0.2.jar)
 * [imageio-metadata-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.0.2/imageio-metadata-3.0.2.jar)
-
+ 
 ImageIO plugins
 * [imageio-jpeg-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.0.2/imageio-jpeg-3.0.2.jar)
 * [imageio-tiff-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.0.2/imageio-tiff-3.0.2.jar)
@@ -500,14 +561,15 @@ ImageIO plugins
 * [imageio-icns-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.0.2/imageio-icns-3.0.2.jar)
 * [imageio-ico-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-ico/3.0.2/imageio-ico-3.0.2.jar)
 * [imageio-thumbsdb-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.0.2/imageio-thumbsdb-3.0.2.jar)
-
+ 
 ImageIO plugins requiring 3rd party libs
 * [imageio-batik-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.0.2/imageio-batik-3.0.2.jar)
 * [imageio-jmagick-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jmagick/3.0.2/imageio-jmagick-3.0.2.jar)
-
+ 
 Servlet support
 * [servlet-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.0.2/servlet-3.0.2.jar)

+
 ## License

 The project is distributed under the OSI approved [BSD license](http://opensource.org/licenses/BSD-3-Clause):
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>

    <groupId>com.twelvemonkeys.bom</groupId>
@@ -58,6 +58,11 @@
                <artifactId>imageio-bmp</artifactId>
                <version>${project.version}</version>
            </dependency>
+            <dependency>
+                <groupId>com.twelvemonkeys.imageio</groupId>
+                <artifactId>imageio-hdr</artifactId>
+                <version>${project.version}</version>
+            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-icns</artifactId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>common-image</artifactId>
    <packaging>jar</packaging>
@@ -1465,7 +1465,7 @@ public class ResampleOp implements BufferedImageOp/* TODO: RasterOp */ {

            for (int i = 0; i < dstHeight; i++) {
                //contribY[i].n = 0;
-                contribY[i].p = new Contributor[(int) (width * 2.0 + 1)];
+                contribY[i].p = new Contributor[(int) (width * 2.0 + 1 + 0.5)];

                double center = (double) i / yscale;
                int left = (int) Math.ceil(center - width);
@@ -1516,7 +1516,7 @@ public class ResampleOp implements BufferedImageOp/* TODO: RasterOp */ {
        else {
            for (int i = 0; i < dstHeight; ++i) {
                //contribY[i].n = 0;
-                contribY[i].p = new Contributor[(int) (fwidth * 2 + 1)];
+                contribY[i].p = new Contributor[(int) (fwidth * 2 + 1 + 0.5)];

                double center = (double) i / yscale;
                double left = Math.ceil(center - fwidth);
@@ -69,7 +69,7 @@ public class ResampleOpTestCase {
    }

    private void assertResampleBufferedImageTypes(final int pFilterType) {
-        List<String> exceptions = new ArrayList<String>();
+        List<String> exceptions = new ArrayList<>();

        // Test all image types in BufferedImage
        for (int type = BufferedImage.TYPE_INT_ARGB; type <= BufferedImage.TYPE_BYTE_INDEXED; type++) {
@@ -304,6 +304,18 @@ public class ResampleOpTestCase {
        assertResampleBufferedImageTypes(ResampleOp.FILTER_LANCZOS);
    }

+    // https://github.com/haraldk/TwelveMonkeys/issues/195
+    @Test
+    public void testAIOOBE() {
+        BufferedImage myImage = new BufferedImage(100, 354, BufferedImage.TYPE_INT_ARGB);
+
+        for (int i = 19; i > 0; i--) {
+            ResampleOp resampler = new ResampleOp(100, i, ResampleOp.FILTER_LANCZOS);
+            BufferedImage resizedImage = resampler.filter(myImage, null);
+            assertNotNull(resizedImage);
+        }
+    }
+
    @Ignore("Not for general unit testing")
    @Test
    public void testTime() {
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>common-io</artifactId>
    <packaging>jar</packaging>
@@ -22,7 +22,7 @@
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>common-lang</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
            <scope>test</scope>
        </dependency>
    </dependencies>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>common-lang</artifactId>
    <packaging>jar</packaging>
@@ -142,7 +142,7 @@ public final class DateUtil {
     * @param pTime time
     * @return the time rounded to the closest second.
     */
-    public static long roundToSecond(long pTime) {
+    public static long roundToSecond(final long pTime) {
        return (pTime / SECOND) * SECOND;
    }

@@ -152,7 +152,7 @@ public final class DateUtil {
     * @param pTime time
     * @return the time rounded to the closest minute.
     */
-    public static long roundToMinute(long pTime) {
+    public static long roundToMinute(final long pTime) {
        return (pTime / MINUTE) * MINUTE;
    }

@@ -162,9 +162,20 @@ public final class DateUtil {
     * @param pTime time
     * @return the time rounded to the closest hour.
     */
-    public static long roundToHour(long pTime) {
-        // TODO: What if timezone offset is sub hour? Are there any? I think so...
-        return ((pTime / HOUR) * HOUR);
+    public static long roundToHour(final long pTime) {
+        return roundToHour(pTime, TimeZone.getDefault());
+    }
+
+    /**
+     * Rounds the given time down to the closest hour, using the given timezone.
+     *
+     * @param pTime time
+     * @param pTimeZone the timezone to use when rounding
+     * @return the time rounded to the closest hour.
+     */
+    public static long roundToHour(final long pTime, final TimeZone pTimeZone) {
+        int offset = pTimeZone.getOffset(pTime);
+        return ((pTime / HOUR) * HOUR) - offset;
    }

    /**
@@ -173,7 +184,7 @@ public final class DateUtil {
     * @param pTime time
     * @return the time rounded to the closest day.
     */
-    public static long roundToDay(long pTime) {
+    public static long roundToDay(final long pTime) {
        return roundToDay(pTime, TimeZone.getDefault());
    }

@@ -184,7 +195,7 @@ public final class DateUtil {
     * @param pTimeZone the timezone to use when rounding
     * @return the time rounded to the closest day.
     */
-    public static long roundToDay(long pTime, TimeZone pTimeZone) {
+    public static long roundToDay(final long pTime, final TimeZone pTimeZone) {
        int offset = pTimeZone.getOffset(pTime);
        return (((pTime  + offset) / DAY) * DAY) - offset;
    }
@@ -29,11 +29,15 @@
 package com.twelvemonkeys.lang;

 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;

+import java.util.Arrays;
 import java.util.Calendar;
+import java.util.List;
 import java.util.TimeZone;

-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;

 /**
 * DateUtilTest
@@ -42,9 +46,30 @@ import static org.junit.Assert.*;
 * @author last modified by $Author: haraldk$
 * @version $Id: DateUtilTest.java,v 1.0 11.04.12 16:21 haraldk Exp$
 */
+@RunWith(Parameterized.class)
 public class DateUtilTest {
-    private static Calendar getCalendar(long time) {
-        Calendar calendar = Calendar.getInstance(TimeZone.getDefault());
+
+    private final TimeZone timeZone;
+
+    @Parameterized.Parameters
+    public static List<Object[]> timeZones() {
+        return Arrays.asList(new Object[][] {
+                {TimeZone.getTimeZone("UTC")},
+                {TimeZone.getTimeZone("CET")},
+                {TimeZone.getTimeZone("IST")}, // 30 min off
+        });
+    }
+
+    public DateUtilTest(final TimeZone timeZone) {
+        this.timeZone = timeZone;
+    }
+
+    private Calendar getCalendar(long time) {
+        return getCalendar(time, TimeZone.getDefault());
+    }
+
+    private Calendar getCalendar(long time, final TimeZone timeZone) {
+        Calendar calendar = Calendar.getInstance(timeZone);
        calendar.setTimeInMillis(time);

        return calendar;
@@ -74,6 +99,15 @@ public class DateUtilTest {
        assertEquals(0, calendar.get(Calendar.MINUTE));
    }

+    @Test
+    public void testRoundToHourTZ() {
+        Calendar calendar = getCalendar(DateUtil.roundToHour(System.currentTimeMillis(), timeZone), timeZone);
+
+        assertEquals(0, calendar.get(Calendar.MILLISECOND));
+        assertEquals(0, calendar.get(Calendar.SECOND));
+        assertEquals(0, calendar.get(Calendar.MINUTE));
+    }
+
    @Test
    public void testRoundToDay() {
        Calendar calendar = getCalendar(DateUtil.roundToDay(System.currentTimeMillis()));
@@ -84,6 +118,16 @@ public class DateUtilTest {
        assertEquals(0, calendar.get(Calendar.HOUR_OF_DAY));
    }

+    @Test
+    public void testRoundToDayTZ() {
+        Calendar calendar = getCalendar(DateUtil.roundToDay(System.currentTimeMillis(), timeZone), timeZone);
+
+        assertEquals(0, calendar.get(Calendar.MILLISECOND));
+        assertEquals(0, calendar.get(Calendar.SECOND));
+        assertEquals(0, calendar.get(Calendar.MINUTE));
+        assertEquals(0, calendar.get(Calendar.HOUR_OF_DAY));
+    }
+
    @Test
    public void testCurrentTimeSecond() {
        Calendar calendar = getCalendar(DateUtil.currentTimeSecond());
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <groupId>com.twelvemonkeys.common</groupId>
    <artifactId>common</artifactId>
@@ -32,7 +32,7 @@
                <groupId>${project.groupId}</groupId>
                <artifactId>common-lang</artifactId>
                <version>${project.version}</version>
-                <classifier>tests</classifier>
+                <type>test-jar</type>
                <scope>test</scope>
            </dependency>

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-batik</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Batik Plugin</name>
@@ -23,27 +23,43 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>

+        <!-- Batik 1.6 contains a mysterious xml-apis:xml-apis:1.1.2 that doesn't exist, override with never version -->
        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-rasterizer-ext</artifactId>
-            <version>1.6-1</version>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.3.04</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Nothing works without Xerces. Not sure why neither 1.6 or 1.8 versions needed this... -->
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.4.0</version>
            <scope>provided</scope>
        </dependency>

        <dependency>
-            <groupId>batik</groupId>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-rasterizer</artifactId>
+            <version>1.6.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>batik-svggen</artifactId>
-            <version>1.6-1</version>
+            <version>1.6.1</version>
            <scope>provided</scope>
        </dependency>

        <dependency>
-            <groupId>batik</groupId>
+            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>batik-transcoder</artifactId>
-            <version>1.6-1</version>
+            <version>1.6.1</version>
            <scope>provided</scope>

            <!--
@@ -34,6 +34,7 @@ import com.twelvemonkeys.imageio.util.IIOUtil;
 import javax.imageio.ImageReader;
 import javax.imageio.spi.ServiceRegistry;
 import javax.imageio.stream.ImageInputStream;
+import java.io.EOFException;
 import java.io.IOException;
 import java.util.Locale;

@@ -61,8 +62,7 @@ public final class SVGImageReaderSpi extends ImageReaderSpiBase {

    private static boolean canDecode(final ImageInputStream pInput) throws IOException {
        // NOTE: This test is quite quick as it does not involve any parsing,
-        // however it requires the doctype to be "svg", which may not be correct
-        // in all cases...
+        // however it may not recognize all kinds of SVG documents.
        try {
            pInput.mark();

@@ -74,51 +74,76 @@ public final class SVGImageReaderSpi extends ImageReaderSpiBase {
                // Skip over leading WS
            }

-            if (!((b == '<') && (pInput.read() == '?') && (pInput.read() == 'x') && (pInput.read() == 'm')
-                    && (pInput.read() == 'l'))) {
+            // If it's not a tag, this can't be valid XML
+            if (b != '<') {
                return false;
            }

-            // Okay, we have XML. But, is it really SVG?
-            boolean docTypeFound = false;
-            while (!docTypeFound) {
-                while (pInput.read() != '<') {
-                    // Skip over, until begin tag
-                }
+            // Algorithm for detecting SVG:
+            //  - Skip until begin tag '<' and read 4 bytes
+            //  - if next is "?" skip until "?>" and start over
+            //  - else if next is "!--" skip until  "-->" and start over
+            //  - else if next is  "!DOCTYPE " skip any whitespace
+            //      - compare next 3 bytes against "svg", return result
+            //  - else
+            //      - compare next 3 bytes against "svg", return result

-                if ((b = pInput.read()) != '!') {
-                    if (b == 's' && pInput.read() == 'v' && pInput.read() == 'g'
-                            && (Character.isWhitespace((char) (b = pInput.read())) || b == ':')) {
+            byte[] buffer = new byte[4];
+            while (true) {
+                pInput.readFully(buffer);
+
+                if (buffer[0] == '?') {
+                    // This is the XML declaration or a processing instruction
+                    while (!(pInput.read() == '?' && pInput.read() == '>')) {
+                        // Skip until end of XML declaration or processing instruction
+                    }
+                }
+                else if (buffer[0] == '!') {
+                    if (buffer[1] == '-' && buffer[2] == '-') {
+                        // This is a comment
+                        while (!(pInput.read() == '-' && pInput.read() == '-' && pInput.read() == '>')) {
+                            // Skip until end of comment
+                        }
+                    }
+                    else if (buffer[1] == 'D' && buffer[2] == 'O' && buffer[3] == 'C'
+                            && pInput.read() == 'T' && pInput.read() == 'Y'
+                            && pInput.read() == 'P' && pInput.read() == 'E') {
+                        // This is the DOCTYPE declaration
+                        while (Character.isWhitespace((char) (b = pInput.read()))) {
+                            // Skip over WS
+                        }
+
+                        if (b == 's' && pInput.read() == 'v' && pInput.read() == 'g') {
+                            // It's SVG, identified by DOCTYPE
+                            return true;
+                        }
+
+                        // DOCTYPE found, but not SVG
+                        return false;
+                    }
+
+                    // Something else, we'll skip
+                }
+                else {
+                    // This is a normal tag
+                    if (buffer[0] == 's' && buffer[1] == 'v' && buffer[2] == 'g'
+                            && (Character.isWhitespace((char) buffer[3]) || buffer[3] == ':')) {
+                        // It's SVG, identified by root tag
                        // TODO: Support svg with prefix + recognize namespace (http://www.w3.org/2000/svg)!
                        return true;
                    }

-                    // If this is not a comment, or the DOCTYPE declaration, the doc has no DOCTYPE and it can't be svg
+                    // If the tag is not "svg", this isn't SVG
                    return false;
                }

-                // There might be comments before the doctype, unfortunately...
-                // If next is "--", this is a comment
-                if ((b = pInput.read()) == '-' && pInput.read() == '-') {
-                    while (!(pInput.read() == '-' && pInput.read() == '-' && pInput.read() == '>')) {
-                        // Skip until end of comment
-                    }
-                }
-
-                // If we are lucky, this is DOCTYPE declaration
-                if (b == 'D' && pInput.read() == 'O' && pInput.read() == 'C' && pInput.read() == 'T'
-                        && pInput.read() == 'Y' && pInput.read() == 'P' && pInput.read() == 'E') {
-                    docTypeFound = true;
-                    while (Character.isWhitespace((char) (b = pInput.read()))) {
-                        // Skip over WS
-                    }
-
-                    if (b == 's' && pInput.read() == 'v' && pInput.read() == 'g') {
-                        return true;
-                    }
+                while (pInput.read() != '<') {
+                    // Skip over, until next begin tag
                }
            }
-
+        }
+        catch (EOFException ignore) {
+            // Possible for small files...
            return false;
        }
        finally {
@@ -59,7 +59,8 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
        return Arrays.asList(
                new TestData(getClassLoaderResource("/svg/batikLogo.svg"), new Dimension(450, 500)),
                new TestData(getClassLoaderResource("/svg/red-square.svg"), new Dimension(100, 100)),
-                new TestData(getClassLoaderResource("/svg/blue-square.svg"), new Dimension(100, 100))
+                new TestData(getClassLoaderResource("/svg/blue-square.svg"), new Dimension(100, 100)),
+                new TestData(getClassLoaderResource("/svg/Android_robot.svg"), new Dimension(400, 400))
        );
    }

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-147 -70 294 345">
+<g fill="#a4c639">
+<use stroke-width="14.4" xlink:href="#b" stroke="#FFF"/>
+<use xlink:href="#a" transform="scale(-1,1)"/>
+<g id="a" stroke="#FFF" stroke-width="7.2">
+<rect rx="6.5" transform="rotate(29)" height="86" width="13" y="-86" x="14"/>
+<rect id="c" rx="24" height="133" width="48" y="41" x="-143"/>
+<use y="97" x="85" xlink:href="#c"/>
+</g>
+<g id="b">
+<ellipse cy="41" rx="91" ry="84"/>
+<rect rx="22" height="182" width="182" y="20" x="-91"/>
+</g>
+</g>
+<g stroke="#FFF" stroke-width="7.2" fill="#FFF">
+<path d="m-95 44.5h190"/><circle cx="-42" r="4"/><circle cx="42" r="4"/>
+</g>
+</svg>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-bmp</artifactId>
    <name>TwelveMonkeys :: ImageIO :: BMP plugin</name>
@@ -18,7 +18,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -28,17 +28,16 @@

 package com.twelvemonkeys.imageio.plugins.bmp;

+import com.twelvemonkeys.imageio.AbstractMetadata;
 import com.twelvemonkeys.lang.Validate;
 import org.w3c.dom.Node;

-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;

 /**
 * BMPMetadata.
 */
-final class BMPMetadata extends IIOMetadata {
+final class BMPMetadata extends AbstractMetadata {
    /** We return metadata in the exact same form as the JRE built-in, to be compatible with the BMPImageWriter. */
    public static final String nativeMetadataFormatName = "javax_imageio_bmp_1.0";

@@ -46,46 +45,13 @@ final class BMPMetadata extends IIOMetadata {
    private final int[] colorMap;

    BMPMetadata(final DIBHeader header, final int[] colorMap) {
+        super(true, nativeMetadataFormatName, "com.sun.imageio.plugins.bmp.BMPMetadataFormat", null, null);
        this.header = Validate.notNull(header, "header");
        this.colorMap = colorMap == null || colorMap.length == 0 ? null : colorMap;
-
-        standardFormatSupported = true;
-    }
-
-    @Override public boolean isReadOnly() {
-        return true;
-    }
-
-    @Override public Node getAsTree(final String formatName) {
-        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
-            return getStandardTree();
-        }
-        else if (nativeMetadataFormatName.equals(formatName)) {
-            return getNativeTree();
-        }
-        else {
-            throw new IllegalArgumentException("Unsupported metadata format: " + formatName);
-        }
-    }
-
-    @Override public void mergeTree(final String formatName, final Node root) {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    @Override public void reset() {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
    }

    @Override
-    public String getNativeMetadataFormatName() {
-        return nativeMetadataFormatName;
-    }
-
-    private Node getNativeTree() {
+    protected Node getNativeTree() {
        IIOMetadataNode root = new IIOMetadataNode(nativeMetadataFormatName);

        addChildNode(root, "BMPVersion", header.getBMPVersion());
@@ -170,7 +136,8 @@ final class BMPMetadata extends IIOMetadata {
        return child;
    }

-    @Override protected IIOMetadataNode getStandardChromaNode() {
+    @Override
+    protected IIOMetadataNode getStandardChromaNode() {
        // NOTE: BMP files may contain a color map, even if true color...
        // Not sure if this is a good idea to expose to the meta data,
        // as it might be unexpected... Then again...
@@ -197,7 +164,8 @@ final class BMPMetadata extends IIOMetadata {
        return null;
    }

-    @Override protected IIOMetadataNode getStandardCompressionNode() {
+    @Override
+    protected IIOMetadataNode getStandardCompressionNode() {
        IIOMetadataNode compression = new IIOMetadataNode("Compression");
        IIOMetadataNode compressionTypeName = addChildNode(compression, "CompressionTypeName", null);
        compressionTypeName.setAttribute("value", "NONE");
@@ -229,7 +197,8 @@ final class BMPMetadata extends IIOMetadata {
 //        }
    }

-    @Override protected IIOMetadataNode getStandardDataNode() {
+    @Override
+    protected IIOMetadataNode getStandardDataNode() {
        IIOMetadataNode node = new IIOMetadataNode("Data");

 //        IIOMetadataNode planarConfiguration = new IIOMetadataNode("PlanarConfiguration");
@@ -294,7 +263,8 @@ final class BMPMetadata extends IIOMetadata {
        return buffer.toString();
    }

-    @Override protected IIOMetadataNode getStandardDimensionNode() {
+    @Override
+    protected IIOMetadataNode getStandardDimensionNode() {
        if (header.xPixelsPerMeter > 0 || header.yPixelsPerMeter > 0) {
            IIOMetadataNode dimension = new IIOMetadataNode("Dimension");

@@ -302,16 +272,16 @@ final class BMPMetadata extends IIOMetadata {
            addChildNode(dimension, "HorizontalPhysicalPixelSpacing", null);
            addChildNode(dimension, "VerticalPhysicalPixelSpacing", null);

-            //        IIOMetadataNode imageOrientation = new IIOMetadataNode("ImageOrientation");
-            //
-            //        if (header.topDown) {
-            //            imageOrientation.setAttribute("value", "FlipH");
-            //        }
-            //        else {
-            //            imageOrientation.setAttribute("value", "Normal");
-            //        }
-            //
-            //        dimension.appendChild(imageOrientation);
+//        IIOMetadataNode imageOrientation = new IIOMetadataNode("ImageOrientation");
+//
+//        if (header.topDown) {
+//            imageOrientation.setAttribute("value", "FlipH");
+//        }
+//        else {
+//            imageOrientation.setAttribute("value", "Normal");
+//        }
+//
+//        dimension.appendChild(imageOrientation);

            return dimension;
        }
@@ -325,7 +295,8 @@ final class BMPMetadata extends IIOMetadata {

    // No tiling

-    @Override protected IIOMetadataNode getStandardTransparencyNode() {
+    @Override
+    protected IIOMetadataNode getStandardTransparencyNode() {
        return null;

 //        IIOMetadataNode transparency = new IIOMetadataNode("Transparency");
@@ -43,6 +43,7 @@ abstract class BitmapDescriptor {
    protected final DIBHeader header;

    protected BufferedImage image;
+    protected BitmapMask mask;

    public BitmapDescriptor(final DirectoryEntry pEntry, final DIBHeader pHeader) {
        Validate.notNull(pEntry, "entry");
@@ -69,4 +70,17 @@ abstract class BitmapDescriptor {
    protected final int getBitCount() {
        return entry.getBitCount() != 0 ? entry.getBitCount() : header.getBitCount();
    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[" + entry + ", " + header + "]";
+    }
+
+    public final void setMask(final BitmapMask mask) {
+        this.mask = mask;
+    }
+
+    public final boolean hasMask() {
+        return header.getHeight() == getHeight() * 2;
+    }
 }
@@ -28,8 +28,6 @@

 package com.twelvemonkeys.imageio.plugins.bmp;

-import com.twelvemonkeys.image.InverseColorMapIndexColorModel;
-
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBuffer;
 import java.awt.image.IndexColorModel;
@@ -46,8 +44,6 @@ class BitmapIndexed extends BitmapDescriptor {
    protected final int[] bits;
    protected final int[] colors;

-    private BitmapMask mask;
-
    public BitmapIndexed(final DirectoryEntry pEntry, final DIBHeader pHeader) {
        super(pEntry, pHeader);
        bits = new int[getWidth() * getHeight()];
@@ -65,7 +61,7 @@ class BitmapIndexed extends BitmapDescriptor {
        // This is slightly obscure, and should probably be moved..
        Hashtable<String, Object> properties = null;
        if (entry instanceof DirectoryEntry.CUREntry) {
-            properties = new Hashtable<String, Object>(1);
+            properties = new Hashtable<>(1);
            properties.put("cursor_hotspot", ((DirectoryEntry.CUREntry) this.entry).getHotspot());
        }

@@ -89,8 +85,6 @@ class BitmapIndexed extends BitmapDescriptor {

        raster.setSamples(0, 0, getWidth(), getHeight(), 0, bits);

-        //System.out.println("Image: " + image);
-
        return image;
    }

@@ -100,40 +94,40 @@ class BitmapIndexed extends BitmapDescriptor {
    IndexColorModel createColorModel() {
        // NOTE: This is a hack to make room for transparent pixel for mask
        int bits = getBitCount();
-        
+
        int colors = this.colors.length;
-        int trans = -1;
+        int transparent = -1;

        // Try to avoid USHORT transfertype, as it results in BufferedImage TYPE_CUSTOM
        // NOTE: This code assumes icons are small, and is NOT optimized for performance...
        if (colors > (1 << getBitCount())) {
-            int index = findTransIndexMaybeRemap(this.colors, this.bits);
+            int index = findTransparentIndexMaybeRemap(this.colors, this.bits);

            if (index == -1) {
                // No duplicate found, increase bitcount
                bits++;
-                trans = this.colors.length - 1;
+                transparent = this.colors.length - 1;
            }
            else {
-                // Found a duplicate, use it as trans
-                trans = index;
+                // Found a duplicate, use it as transparent
+                transparent = index;
                colors--;
            }
        }

        // NOTE: Setting hasAlpha to true, makes things work on 1.2
-        return new InverseColorMapIndexColorModel(
-                bits, colors, this.colors, 0, true, trans,
+        return new IndexColorModel(
+                bits, colors, this.colors, 0, true, transparent,
                bits <= 8 ? DataBuffer.TYPE_BYTE : DataBuffer.TYPE_USHORT
        );
    }

-    private static int findTransIndexMaybeRemap(final int[] pColors, final int[] pBits) {
+    private static int findTransparentIndexMaybeRemap(final int[] colors, final int[] bits) {
        // Look for unused colors, to use as transparent
-        final boolean[] used = new boolean[pColors.length - 1];
-        for (int pBit : pBits) {
-            if (!used[pBit]) {
-                used[pBit] = true;
+        boolean[] used = new boolean[colors.length - 1];
+        for (int bit : bits) {
+            if (!used[bit]) {
+                used[bit] = true;
            }
        }

@@ -144,38 +138,35 @@ class BitmapIndexed extends BitmapDescriptor {
        }

        // Try to find duplicates in colormap, and remap
-        int trans = -1;
+        int transparent = -1;
        int duplicate = -1;
-        for (int i = 0; trans == -1 && i < pColors.length - 1; i++) {
-            for (int j = i + 1; j < pColors.length - 1; j++) {
-                if (pColors[i] == pColors[j]) {
-                    trans = j;
+        for (int i = 0; transparent == -1 && i < colors.length - 1; i++) {
+            for (int j = i + 1; j < colors.length - 1; j++) {
+                if (colors[i] == colors[j]) {
+                    transparent = j;
                    duplicate = i;
                    break;
                }
            }
        }

-        if (trans != -1) {
+        if (transparent != -1) {
            // Remap duplicate
-            for (int i = 0; i < pBits.length; i++) {
-                if (pBits[i] == trans) {
-                    pBits[i] = duplicate;
+            for (int i = 0; i < bits.length; i++) {
+                if (bits[i] == transparent) {
+                    bits[i] = duplicate;
                }
            }
        }

-        return trans;
+        return transparent;
    }

    public BufferedImage getImage() {
        if (image == null) {
            image = createImageIndexed();
        }
+
        return image;
    }
-
-    public void setMask(final BitmapMask pMask) {
-        mask = pMask;
-    }
 }
@@ -38,19 +38,19 @@ import java.awt.image.BufferedImage;
 * @version $Id: BitmapMask.java,v 1.0 25.feb.2006 00:29:44 haku Exp$
 */
 class BitmapMask extends BitmapDescriptor {
-    protected final BitmapIndexed mask;
+    protected final BitmapIndexed bitMask;

    public BitmapMask(final DirectoryEntry pParent, final DIBHeader pHeader) {
        super(pParent, pHeader);
-        mask = new BitmapIndexed(pParent, pHeader);
+        bitMask = new BitmapIndexed(pParent, pHeader);
    }

    boolean isTransparent(final int pX, final int pY) {
        // NOTE: 1: Fully transparent, 0: Opaque...
-        return mask.bits[pX + pY * getWidth()] != 0;
+        return bitMask.bits[pX + pY * getWidth()] != 0;
    }

    public BufferedImage getImage() {
-        return mask.getImage();
+        return bitMask.getImage();
    }
 }
@@ -28,7 +28,9 @@

 package com.twelvemonkeys.imageio.plugins.bmp;

+import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;

 /**
 * Describes an RGB/true color bitmap structure (16, 24 and 32 bits per pixel).
@@ -43,6 +45,38 @@ class BitmapRGB extends BitmapDescriptor {
    }

    public BufferedImage getImage() {
+        // Test is mask != null rather than hasMask(), as 32 bit (w/alpha)
+        // might still have bitmask, but we don't read or use it.
+        if (mask != null) {
+            image = createMaskedImage();
+            mask = null;
+        }
+
        return image;
    }
+
+    private BufferedImage createMaskedImage() {
+        BufferedImage masked = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
+
+        Graphics2D graphics = masked.createGraphics();
+        try {
+            graphics.drawImage(image, 0, 0, null);
+        }
+        finally {
+            graphics.dispose();
+        }
+
+        WritableRaster alphaRaster = masked.getAlphaRaster();
+
+        byte[] trans = {0x0};
+        for (int y = 0; y < getHeight(); y++) {
+            for (int x = 0; x < getWidth(); x++) {
+                if (mask.isTransparent(x, y)) {
+                    alphaRaster.setDataElements(x, y, trans);
+                }
+            }
+        }
+
+        return masked;
+    }
 }
@@ -66,14 +66,15 @@ import java.util.List;
 // TODO: Decide whether DirectoryEntry or DIBHeader should be primary source for color count/bit count
 // TODO: Support loading icons from DLLs, see
 // <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwui/html/msdn_icons.asp">MSDN</a>
-// Known issue: 256x256 PNG encoded icons does not have IndexColorModel even if stated in DirectoryEntry (seem impossible as the PNGs are all true color)
+// Known issue: 256x256 PNG encoded icons does not have IndexColorModel even if stated in DirectoryEntry
+// (seem impossible as the PNGs are all true color)
 abstract class DIBImageReader extends ImageReaderBase {
    // TODO: Consider moving the reading to inner classes (subclasses of BitmapDescriptor)
    private Directory directory;

    // TODO: Review these, make sure we don't have a memory leak
-    private Map<DirectoryEntry, DIBHeader> headers = new WeakHashMap<DirectoryEntry, DIBHeader>();
-    private Map<DirectoryEntry, BitmapDescriptor> descriptors = new WeakWeakMap<DirectoryEntry, BitmapDescriptor>();
+    private Map<DirectoryEntry, DIBHeader> headers = new WeakHashMap<>();
+    private Map<DirectoryEntry, BitmapDescriptor> descriptors = new WeakWeakMap<>();

    private ImageReader pngImageReader;

@@ -101,7 +102,7 @@ abstract class DIBImageReader extends ImageReaderBase {
            return getImageTypesPNG(entry);
        }

-        List<ImageTypeSpecifier> types = new ArrayList<ImageTypeSpecifier>();
+        List<ImageTypeSpecifier> types = new ArrayList<>();
        DIBHeader header = getHeader(entry);

        // Use data from header to create specifier
@@ -121,10 +122,13 @@ abstract class DIBImageReader extends ImageReaderBase {
                specifier = ImageTypeSpecifiers.createFromIndexColorModel(indexed.createColorModel());
                break;
            case 16:
+                // TODO: May have mask?!
                specifier = ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_USHORT_555_RGB);
                break;
            case 24:
-                specifier = ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR);
+                specifier = new BitmapRGB(entry, header).hasMask()
+                            ? ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_4BYTE_ABGR)
+                            : ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR);
                break;
            case 32:
                specifier = ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_ARGB);
@@ -184,6 +188,7 @@ abstract class DIBImageReader extends ImageReaderBase {
            }
            else {
                Graphics2D g = destination.createGraphics();
+
                try {
                    g.setComposite(AlphaComposite.Src);
                    g.drawImage(image, 0, 0, null);
@@ -335,7 +340,7 @@ abstract class DIBImageReader extends ImageReaderBase {
        }

        BitmapMask mask = new BitmapMask(pBitmap.entry, pBitmap.header);
-        readBitmapIndexed1(mask.mask, true);
+        readBitmapIndexed1(mask.bitMask, true);
        pBitmap.setMask(mask);
    }

@@ -370,7 +375,7 @@ abstract class DIBImageReader extends ImageReaderBase {
                }
            }

-            // NOTE: If we are reading the mask, we don't abort or progress
+            // NOTE: If we are reading the mask, we don't abort or report progress
            if (!pAsMask) {
                if (abortRequested()) {
                    processReadAborted();
@@ -455,7 +460,7 @@ abstract class DIBImageReader extends ImageReaderBase {
        short[] pixels = new short[pBitmap.getWidth() * pBitmap.getHeight()];

        // TODO: Support TYPE_USHORT_565 and the RGB 444/ARGB 4444 layouts
-        // Will create TYPE_USHORT_555;
+        // Will create TYPE_USHORT_555
        DirectColorModel cm = new DirectColorModel(16, 0x7C00, 0x03E0, 0x001F);
        DataBuffer buffer = new DataBufferShort(pixels, pixels.length);
        WritableRaster raster = Raster.createPackedRaster(
@@ -480,6 +485,8 @@ abstract class DIBImageReader extends ImageReaderBase {

            processImageProgress(100 * y / (float) pBitmap.getHeight());
        }
+
+        // TODO: Might be mask!?
    }

    private void readBitmap24(final BitmapDescriptor pBitmap) throws IOException {
@@ -494,16 +501,19 @@ abstract class DIBImageReader extends ImageReaderBase {
                cs, nBits, false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE
        );

+        int scanlineStride = pBitmap.getWidth() * 3;
+        // BMP rows are padded to 4 byte boundary
+        int rowSizeBytes = ((8 * scanlineStride + 31) / 32) * 4;
+
        WritableRaster raster = Raster.createInterleavedRaster(
-                buffer, pBitmap.getWidth(), pBitmap.getHeight(), pBitmap.getWidth(), 3, bOffs, null
+                buffer, pBitmap.getWidth(), pBitmap.getHeight(), scanlineStride, 3, bOffs, null
        );
        pBitmap.image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
-        
-        for (int y = 0; y < pBitmap.getHeight(); y++) {
-            int offset = (pBitmap.getHeight() - y - 1) * pBitmap.getWidth();
-            imageInput.readFully(pixels, offset, pBitmap.getWidth() * 3);

-            // TODO: Possibly read padding byte here!
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
+            int offset = (pBitmap.getHeight() - y - 1) * scanlineStride;
+            imageInput.readFully(pixels, offset, scanlineStride);
+            imageInput.skipBytes(rowSizeBytes - scanlineStride);

            if (abortRequested()) {
                processReadAborted();
@@ -512,6 +522,14 @@ abstract class DIBImageReader extends ImageReaderBase {

            processImageProgress(100 * y / (float) pBitmap.getHeight());
        }
+
+        // 24 bit icons usually have a bit mask
+        if (pBitmap.hasMask()) {
+            BitmapMask mask = new BitmapMask(pBitmap.entry, pBitmap.header);
+            readBitmapIndexed1(mask.bitMask, true);
+
+            pBitmap.setMask(mask);
+        }
    }

    private void readBitmap32(final BitmapDescriptor pBitmap) throws IOException {
@@ -535,6 +553,9 @@ abstract class DIBImageReader extends ImageReaderBase {
            }            
            processImageProgress(100 * y / (float) pBitmap.getHeight());
        }
+
+        // There might be a mask here as well, but we'll ignore it,
+        // and use the 8 bit alpha channel in the ARGB pixel data
    }

    private Directory getDirectory() throws IOException {
@@ -39,7 +39,9 @@ public class ICOImageReaderTest extends ImageReaderAbstractTest<ICOImageReader>
                        new Dimension(16, 16), new Dimension(16, 16), new Dimension(32, 32), new Dimension(32, 32),
                        new Dimension(48, 48), new Dimension(48, 48), new Dimension(256, 256), new Dimension(256, 256),
                        new Dimension(16, 16), new Dimension(32, 32), new Dimension(48, 48), new Dimension(256, 256)
-                )
+                ),
+                // Problematic icon that reports 24 bit in the descriptor, but has separate 1 bit ''mask (height 2 x icon height)!
+                new TestData(getClassLoaderResource("/ico/rgb24bitmask.ico"), new Dimension(32, 32))
        );
    }

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-clippath</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Photoshop Path Support</name>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-core</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Core</name>
@@ -26,7 +26,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-package com.twelvemonkeys.imageio.plugins.psd;
+package com.twelvemonkeys.imageio;

 import org.w3c.dom.Node;

@@ -42,13 +42,15 @@ import java.util.Arrays;
 * @author last modified by $Author: haraldk$
 * @version $Id: AbstractMetadata.java,v 1.0 Nov 13, 2009 1:02:12 AM haraldk Exp$
 */
-abstract class AbstractMetadata extends IIOMetadata implements Cloneable {
-    // TODO: Move to core...
+public abstract class AbstractMetadata extends IIOMetadata implements Cloneable {
+    protected AbstractMetadata(final boolean standardFormatSupported,
+                               final String nativeFormatName, final String nativeFormatClassName,
+                               final String[] extraFormatNames, final String[] extraFormatClassNames) {
+        super(standardFormatSupported, nativeFormatName, nativeFormatClassName, extraFormatNames, extraFormatClassNames);
+    }

-    protected AbstractMetadata(final boolean pStandardFormatSupported,
-                               final String pNativeFormatName, final String pNativeFormatClassName,
-                               final String[] pExtraFormatNames, final String[] pExtraFormatClassNames) {
-        super(pStandardFormatSupported, pNativeFormatName, pNativeFormatClassName, pExtraFormatNames, pExtraFormatClassNames);
+    protected AbstractMetadata() {
+        super(true, null, null, null, null);
    }

    /**
@@ -63,36 +65,38 @@ abstract class AbstractMetadata extends IIOMetadata implements Cloneable {
    }

    @Override
-    public Node getAsTree(final String pFormatName) {
-        validateFormatName(pFormatName);
+    public Node getAsTree(final String formatName) {
+        validateFormatName(formatName);

-        if (pFormatName.equals(nativeMetadataFormatName)) {
+        if (formatName.equals(nativeMetadataFormatName)) {
            return getNativeTree();
        }
-        else if (pFormatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) {
+        else if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) {
            return getStandardTree();
        }

-        // TODO: What about extra formats??
-        throw new AssertionError("Unreachable");
+        // Subclasses that supports extra formats need to check for these formats themselves...
+        return null;
+    }
+
+    /**
+     * Default implementation that throws {@code UnsupportedOperationException}.
+     * Subclasses that supports formats other than standard metadata should override this method.
+     *
+     * @throws UnsupportedOperationException
+     */
+    protected Node getNativeTree() {
+        throw new UnsupportedOperationException("getNativeTree");
    }

    @Override
-    public void mergeTree(final String pFormatName, final Node pRoot) throws IIOInvalidTreeException {
+    public void mergeTree(final String formatName, final Node root) throws IIOInvalidTreeException {
        assertMutable();

-        validateFormatName(pFormatName);
+        validateFormatName(formatName);

-        if (!pRoot.getNodeName().equals(nativeMetadataFormatName)) {
-            throw new IIOInvalidTreeException("Root must be " + nativeMetadataFormatName, pRoot);
-        }
-
-        Node node = pRoot.getFirstChild();
-        while (node != null) {
-            // TODO: Merge values from node into this
-
-            // Move to the next sibling
-            node = node.getNextSibling();
+        if (!root.getNodeName().equals(formatName)) {
+            throw new IIOInvalidTreeException("Root must be " + formatName, root);
        }
    }

@@ -112,21 +116,19 @@ abstract class AbstractMetadata extends IIOMetadata implements Cloneable {
        }
    }

-    protected abstract Node getNativeTree();
-
-    protected final void validateFormatName(final String pFormatName) {
+    protected final void validateFormatName(final String formatName) {
        String[] metadataFormatNames = getMetadataFormatNames();

        if (metadataFormatNames != null) {
            for (String metadataFormatName : metadataFormatNames) {
-                if (metadataFormatName.equals(pFormatName)) {
+                if (metadataFormatName.equals(formatName)) {
                    return; // Found, we're ok!
                }
            }
        }

        throw new IllegalArgumentException(
-                String.format("Bad format name: \"%s\". Expected one of %s", pFormatName, Arrays.toString(metadataFormatNames))
+                String.format("Bad format name: \"%s\". Expected one of %s", formatName, Arrays.toString(metadataFormatNames))
        );
    }

@@ -0,0 +1,151 @@
+package com.twelvemonkeys.imageio.color;
+
+import com.twelvemonkeys.lang.Validate;
+
+/**
+ * Converts between CIE L*a*b* and sRGB color spaces.
+ */
+// Code adapted from ImageJ's Color_Space_Converter.java (Public Domain):
+// http://rsb.info.nih.gov/ij/plugins/download/Color_Space_Converter.java
+public final class CIELabColorConverter {
+    // TODO: Create interface in the color package?
+    // TODO: Make YCbCr/YCCK -> RGB/CMYK implement same interface?
+
+    public enum Illuminant {
+        D50(new float[] {96.4212f, 100.0f, 82.5188f}),
+        D65(new float[] {95.0429f, 100.0f, 108.8900f});
+
+        private final float[] whitePoint;
+
+        Illuminant(final float[] wp) {
+            whitePoint = Validate.isTrue(wp != null && wp.length == 3, wp, "Bad white point definition: %s");
+        }
+
+        public float[] getWhitePoint() {
+            return whitePoint;
+        }
+    }
+
+    private final float[] whitePoint;
+
+    public CIELabColorConverter(final Illuminant illuminant) {
+        whitePoint = Validate.notNull(illuminant, "illuminant").getWhitePoint();
+    }
+
+    private float clamp(float x) {
+        if (x < 0.0f) {
+            return 0.0f;
+        }
+        else if (x > 255.0f) {
+            return 255.0f;
+        }
+        else {
+            return x;
+        }
+    }
+
+    public void toRGB(float l, float a, float b, float[] rgbResult) {
+        XYZtoRGB(LABtoXYZ(l, a, b, rgbResult), rgbResult);
+    }
+
+    /**
+     * Convert LAB to XYZ.
+     * @param L
+     * @param a
+     * @param b
+     * @return XYZ values
+     */
+    private float[] LABtoXYZ(float L, float a, float b, float[] xyzResult) {
+        // Significant speedup: Removing Math.pow
+        float y = (L + 16.0f) / 116.0f;
+        float y3 = y * y * y; // Math.pow(y, 3.0);
+        float x = (a / 500.0f) + y;
+        float x3 = x * x * x; // Math.pow(x, 3.0);
+        float z = y - (b / 200.0f);
+        float z3 = z * z * z; // Math.pow(z, 3.0);
+
+        if (y3 > 0.008856f) {
+            y = y3;
+        }
+        else {
+            y = (y - (16.0f / 116.0f)) / 7.787f;
+        }
+
+        if (x3 > 0.008856f) {
+            x = x3;
+        }
+        else {
+            x = (x - (16.0f / 116.0f)) / 7.787f;
+        }
+
+        if (z3 > 0.008856f) {
+            z = z3;
+        }
+        else {
+            z = (z - (16.0f / 116.0f)) / 7.787f;
+        }
+
+        xyzResult[0] = x * whitePoint[0];
+        xyzResult[1] = y * whitePoint[1];
+        xyzResult[2] = z * whitePoint[2];
+
+        return xyzResult;
+    }
+
+    /**
+     * Convert XYZ to RGB
+     * @param xyz
+     * @return RGB values
+     */
+    private float[] XYZtoRGB(final float[] xyz, final float[] rgbResult) {
+        return XYZtoRGB(xyz[0], xyz[1], xyz[2], rgbResult);
+    }
+
+    private float[] XYZtoRGB(final float X, final float Y, final float Z, float[] rgbResult) {
+        float x = X / 100.0f;
+        float y = Y / 100.0f;
+        float z = Z / 100.0f;
+
+        float r = x * 3.2406f + y * -1.5372f + z * -0.4986f;
+        float g = x * -0.9689f + y * 1.8758f + z * 0.0415f;
+        float b = x * 0.0557f + y * -0.2040f + z * 1.0570f;
+
+        // assume sRGB
+        if (r > 0.0031308f) {
+            r = ((1.055f * (float) pow(r, 1.0 / 2.4)) - 0.055f);
+        }
+        else {
+            r = (r * 12.92f);
+        }
+
+        if (g > 0.0031308f) {
+            g = ((1.055f * (float) pow(g, 1.0 / 2.4)) - 0.055f);
+        }
+        else {
+            g = (g * 12.92f);
+        }
+
+        if (b > 0.0031308f) {
+            b = ((1.055f * (float) pow(b, 1.0 / 2.4)) - 0.055f);
+        }
+        else {
+            b = (b * 12.92f);
+        }
+
+        // convert 0..1 into 0..255
+        rgbResult[0] = clamp(r * 255);
+        rgbResult[1] = clamp(g * 255);
+        rgbResult[2] = clamp(b * 255);
+
+        return rgbResult;
+    }
+
+    // TODO: Test, to figure out if accuracy is good enough.
+    // Visual inspection looks good! The author claims 5-12% error, worst case up to 25%...
+    // http://martin.ankerl.com/2007/10/04/optimized-pow-approximation-for-java-and-c-c/
+    static double pow(final double a, final double b) {
+        long tmp = Double.doubleToLongBits(a);
+        long tmp2 = (long) (b * (tmp - 4606921280493453312L)) + 4606921280493453312L;
+        return Double.longBitsToDouble(tmp2);
+    }
+}
@@ -52,7 +52,7 @@ import java.util.Properties;
 * <p />
 * Color profiles may be configured by placing a property-file
 * {@code com/twelvemonkeys/imageio/color/icc_profiles.properties}
- * on the classpath, specifying the full path to the profile.
+ * on the classpath, specifying the full path to the profiles.
 * ICC color profiles are probably already present on your system, or
 * can be downloaded from
 * <a href="http://www.color.org/profiles2.xalter">ICC</a>,
@@ -161,6 +161,11 @@ public final class ColorSpaces {

            if (cs == null) {
                cs = new ICC_ColorSpace(profile);
+
+                // Validate the color space, to avoid caching bad color spaces
+                // Will throw IllegalArgumentException or CMMException if the profile is bad
+                cs.fromRGB(new float[] {1f, 0f, 0f});
+
                cache.put(key, cs);
            }

@@ -195,7 +200,7 @@ public final class ColorSpaces {
     * @return {@code true} if known to be offending, {@code false} otherwise
     * @throws IllegalArgumentException if {@code profile} is {@code null}
     */
-    public static boolean isOffendingColorProfile(final ICC_Profile profile) {
+    static boolean isOffendingColorProfile(final ICC_Profile profile) {
        Validate.notNull(profile, "profile");

        // NOTE:
@@ -213,6 +218,26 @@ public final class ColorSpaces {
        return data[ICC_Profile.icHdrRenderingIntent] != 0;
    }

+    /**
+     * Tests whether an ICC color profile is valid.
+     * Invalid profiles are known to cause problems for {@link java.awt.image.ColorConvertOp}.
+     * <p />
+     * <em>
+     * Note that this method only tests if a color conversion using this profile is known to fail.
+     * There's no guarantee that the color conversion will succeed even if this method returns {@code false}.
+     * </em>
+     *
+     * @param profile the ICC color profile. May not be {@code null}.
+     * @return {@code profile} if valid.
+     * @throws IllegalArgumentException if {@code profile} is {@code null}
+     * @throws java.awt.color.CMMException if {@code profile} is invalid.
+     */
+    public static ICC_Profile validateProfile(final ICC_Profile profile) {
+        createColorSpace(profile); // Creating a color space will fail if the profile is bad
+
+        return profile;
+    }
+
    /**
     * Returns the color space specified by the given color space constant.
     * <p />
@@ -317,7 +342,7 @@ public final class ColorSpaces {
            try {
                return ICC_Profile.getInstance(profilePath);
            }
-            catch (IOException ignore) {
+            catch (SecurityException | IOException ignore) {
                if (DEBUG) {
                    ignore.printStackTrace();
                }
@@ -0,0 +1,81 @@
+package com.twelvemonkeys.imageio.color;
+
+/**
+ * Fast YCbCr to RGB conversion.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author Original code by Werner Randelshofer (used by permission).
+ */
+public final class YCbCrConverter {
+    /**
+     * Define tables for YCC->RGB color space conversion.
+     */
+    private final static int SCALEBITS = 16;
+    private final static int MAXJSAMPLE = 255;
+    private final static int CENTERJSAMPLE = 128;
+    private final static int ONE_HALF = 1 << (SCALEBITS - 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 YCC 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;
+        }
+    }
+
+    static {
+        buildYCCtoRGBtable();
+    }
+
+    public static void convertYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final double[] coefficients, final int offset) {
+        double y = (yCbCr[offset] & 0xff);
+        double cb = (yCbCr[offset + 1] & 0xff) - 128;
+        double cr = (yCbCr[offset + 2] & 0xff) - 128;
+
+        double lumaRed = coefficients[0];
+        double lumaGreen = coefficients[1];
+        double lumaBlue = coefficients[2];
+
+        int red = (int) Math.round(cr * (2 - 2 * lumaRed) + y);
+        int blue = (int) Math.round(cb * (2 - 2 * lumaBlue) + y);
+        int green = (int) Math.round((y - lumaRed * red - lumaBlue * blue) / lumaGreen);
+
+        rgb[offset] = clamp(red);
+        rgb[offset + 2] = clamp(blue);
+        rgb[offset + 1] = clamp(green);
+    }
+
+    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 + 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]);
+    }
+
+    private static byte clamp(int val) {
+        return (byte) Math.max(0, Math.min(255, val));
+    }
+}
@@ -0,0 +1,68 @@
+package com.twelvemonkeys.imageio.color;
+
+import com.twelvemonkeys.imageio.color.CIELabColorConverter.Illuminant;
+import org.junit.Test;
+
+import static org.junit.Assert.assertArrayEquals;
+
+/**
+ * CIELabColorConverterTest.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: CIELabColorConverterTest.java,v 1.0 22/10/15 harald.kuhr Exp$
+ */
+public class CIELabColorConverterTest {
+    @Test(expected = IllegalArgumentException.class)
+    public void testNoIllumninant() {
+        new CIELabColorConverter(null);
+    }
+
+    @Test
+    public void testD50() {
+        CIELabColorConverter converter = new CIELabColorConverter(Illuminant.D50);
+        float[] rgb = new float[3];
+
+        converter.toRGB(100, -128, -128, rgb);
+        assertArrayEquals(new float[] {0, 255, 255}, rgb, 1);
+
+        converter.toRGB(100, 0, 0, rgb);
+        assertArrayEquals(new float[] {255, 252, 220}, rgb, 5);
+
+        converter.toRGB(0, 0, 0, rgb);
+        assertArrayEquals(new float[] {0, 0, 0}, rgb, 1);
+
+        converter.toRGB(100, 0, 127, rgb);
+        assertArrayEquals(new float[] {255, 249, 0}, rgb, 5);
+
+        converter.toRGB(50, -128, 127, rgb);
+        assertArrayEquals(new float[] {0, 152, 0}, rgb, 2);
+
+        converter.toRGB(50, 127, -128, rgb);
+        assertArrayEquals(new float[] {222, 0, 255}, rgb, 2);
+    }
+
+    @Test
+    public void testD65() {
+        CIELabColorConverter converter = new CIELabColorConverter(Illuminant.D65);
+        float[] rgb = new float[3];
+
+        converter.toRGB(100, -128, -128, rgb);
+        assertArrayEquals(new float[] {0, 255, 255}, rgb, 1);
+
+        converter.toRGB(100, 0, 0, rgb);
+        assertArrayEquals(new float[] {255, 252, 255}, rgb, 5);
+
+        converter.toRGB(0, 0, 0, rgb);
+        assertArrayEquals(new float[] {0, 0, 0}, rgb, 1);
+
+        converter.toRGB(100, 0, 127, rgb);
+        assertArrayEquals(new float[] {255, 250, 0}, rgb, 5);
+
+        converter.toRGB(50, -128, 127, rgb);
+        assertArrayEquals(new float[] {0, 152, 0}, rgb, 3);
+
+        converter.toRGB(50, 127, -128, rgb);
+        assertArrayEquals(new float[] {184, 0, 255}, rgb, 5);
+    }
+}
@@ -63,6 +63,7 @@ public abstract class ImageWriterAbstractTestCase {

    static {
        IIORegistry.getDefaultInstance().registerServiceProvider(new URLImageInputStreamSpi());
+        ImageIO.setUseCache(false);
    }

    protected abstract ImageWriter createImageWriter();
@@ -120,23 +121,20 @@ public abstract class ImageWriterAbstractTestCase {

        for (RenderedImage testData : getTestData()) {
            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-            ImageOutputStream stream = ImageIO.createImageOutputStream(buffer);
-            writer.setOutput(stream);

-            try {
+            try (ImageOutputStream stream = ImageIO.createImageOutputStream(buffer)) {
+                writer.setOutput(stream);
                writer.write(drawSomething((BufferedImage) testData));
            }
            catch (IOException e) {
                fail(e.getMessage());
            }
-            finally {
-                stream.close(); // Force data to be written
-            }

            assertTrue("No image data written", buffer.size() > 0);
        }
    }

+    @SuppressWarnings("ConstantConditions")
    @Test
    public void testWriteNull() throws IOException {
        ImageWriter writer = createImageWriter();
@@ -0,0 +1,30 @@
+<?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.2.2-SNAPSHOT</version>
+    </parent>
+    <artifactId>imageio-hdr</artifactId>
+    <name>TwelveMonkeys :: ImageIO :: HDR plugin</name>
+    <description>
+        ImageIO plugin for Radiance RGBE High Dynaimc Range format (HDR).
+    </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>
+    </dependencies>
+</project>
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 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.hdr;
+
+/**
+ * HDR.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: HDR.java,v 1.0 27/07/15 harald.kuhr Exp$
+ */
+interface HDR {
+    byte[] RADIANCE_MAGIC = new byte[] {'#', '?', 'R', 'A', 'D', 'I', 'A', 'N', 'C', 'E'};
+    byte[] RGBE_MAGIC = new byte[] {'#', '?', 'R', 'G', 'B', 'E'};
+}
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015, 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.hdr;
+
+import javax.imageio.IIOException;
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+
+/**
+ * HDRHeader.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: HDRHeader.java,v 1.0 27/07/15 harald.kuhr Exp$
+ */
+final class HDRHeader {
+    private static final String KEY_FORMAT = "FORMAT=";
+    private static final String KEY_PRIMARIES = "PRIMARIES=";
+    private static final String KEY_EXPOSURE = "EXPOSURE=";
+    private static final String KEY_GAMMA = "GAMMA=";
+    private static final String KEY_SOFTWARE = "SOFTWARE=";
+
+    private int width;
+    private int height;
+
+    private String software;
+
+    public static HDRHeader read(final ImageInputStream stream) throws IOException {
+        HDRHeader header = new HDRHeader();
+
+        while (true) {
+            String line = stream.readLine().trim();
+
+            if (line.isEmpty()) {
+                // This is the last line before the dimensions
+                break;
+            }
+
+            if (line.startsWith("#?")) {
+                // Program specifier, don't need that...
+            }
+            else if (line.startsWith("#")) {
+                // Comment (ignore)
+            }
+            else if (line.startsWith(KEY_FORMAT)) {
+                String format = line.substring(KEY_FORMAT.length()).trim();
+
+                if (!format.equals("32-bit_rle_rgbe")) {
+                    throw new IIOException("Unsupported format \"" + format + "\"(expected \"32-bit_rle_rgbe\")");
+                }
+                // TODO: Support the 32-bit_rle_xyze format
+            }
+            else if (line.startsWith(KEY_PRIMARIES)) {
+                // TODO: We are going to need these values...
+                // Should contain 8 (RGB + white point) coordinates
+            }
+            else if (line.startsWith(KEY_EXPOSURE)) {
+                // TODO: We are going to need these values...
+            }
+            else if (line.startsWith(KEY_GAMMA)) {
+                // TODO: We are going to need these values...
+            }
+            else if (line.startsWith(KEY_SOFTWARE)) {
+                header.software = line.substring(KEY_SOFTWARE.length()).trim();
+            }
+            else {
+                // ...ignore
+            }
+        }
+
+        // TODO: Proper parsing of width/height and orientation!
+        String dimensionsLine = stream.readLine().trim();
+        String[] dims = dimensionsLine.split("\\s");
+
+        if (dims[0].equals("-Y") && dims[2].equals("+X")) {
+            header.height = Integer.parseInt(dims[1]);
+            header.width = Integer.parseInt(dims[3]);
+
+            return header;
+        }
+        else {
+            throw new IIOException("Unsupported RGBE orientation (expected \"-Y ... +X ...\")");
+        }
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public String getSoftware() {
+        return software;
+    }
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2015, 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.hdr;
+
+import com.twelvemonkeys.imageio.plugins.hdr.tonemap.DefaultToneMapper;
+import com.twelvemonkeys.imageio.plugins.hdr.tonemap.ToneMapper;
+
+import javax.imageio.ImageReadParam;
+
+/**
+ * HDRImageReadParam.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: HDRImageReadParam.java,v 1.0 28/07/15 harald.kuhr Exp$
+ */
+public final class HDRImageReadParam extends ImageReadParam {
+    static final ToneMapper DEFAULT_TONE_MAPPER = new DefaultToneMapper(.1f);
+
+    private ToneMapper toneMapper = DEFAULT_TONE_MAPPER;
+
+    public ToneMapper getToneMapper() {
+        return toneMapper;
+    }
+
+    public void setToneMapper(final ToneMapper toneMapper) {
+        this.toneMapper = toneMapper != null ? toneMapper : DEFAULT_TONE_MAPPER;
+    }
+}
@@ -0,0 +1,258 @@
+/*
+ * Copyright (c) 2015, 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.hdr;
+
+import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.plugins.hdr.tonemap.ToneMapper;
+import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.spi.ImageReaderSpi;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBuffer;
+import java.awt.image.Raster;
+import java.awt.image.WritableRaster;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+
+/**
+ * HDRImageReader.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: HDRImageReader.java,v 1.0 27/07/15 harald.kuhr Exp$
+ */
+public final class HDRImageReader extends ImageReaderBase {
+    // Specs: http://radsite.lbl.gov/radiance/refer/filefmts.pdf
+
+    private HDRHeader header;
+
+    protected HDRImageReader(final ImageReaderSpi provider) {
+        super(provider);
+    }
+
+    @Override
+    protected void resetMembers() {
+        header = null;
+    }
+
+    private void readHeader() throws IOException {
+        if (header == null) {
+            header = HDRHeader.read(imageInput);
+
+            imageInput.flushBefore(imageInput.getStreamPosition());
+        }
+
+        imageInput.seek(imageInput.getFlushedPosition());
+    }
+
+    @Override
+    public int getWidth(int imageIndex) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        return header.getWidth();
+    }
+
+    @Override
+    public int getHeight(int imageIndex) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        return header.getHeight();
+    }
+
+    @Override
+    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        ColorSpace sRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+        return Collections.singletonList(ImageTypeSpecifiers.createInterleaved(sRGB, new int[] {0, 1, 2}, DataBuffer.TYPE_FLOAT, false, false)).iterator();
+    }
+
+    @Override
+    public BufferedImage read(final int imageIndex, final ImageReadParam param) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        int width = getWidth(imageIndex);
+        int height = getHeight(imageIndex);
+
+        BufferedImage destination = getDestination(param, getImageTypes(imageIndex), width, height);
+
+        Rectangle srcRegion = new Rectangle();
+        Rectangle destRegion = new Rectangle();
+        computeRegions(param, width, height, destination, srcRegion, destRegion);
+
+        WritableRaster raster = destination.getRaster()
+                .createWritableChild(destRegion.x, destRegion.y, destRegion.width, destRegion.height, 0, 0, null);
+
+        int xSub = param != null ? param.getSourceXSubsampling() : 1;
+        int ySub = param != null ? param.getSourceYSubsampling() : 1;
+
+        // Allow pluggable tone mapper via ImageReadParam
+        ToneMapper toneMapper = param instanceof HDRImageReadParam
+                                ? ((HDRImageReadParam) param).getToneMapper()
+                                : HDRImageReadParam.DEFAULT_TONE_MAPPER;
+
+        byte[] rowRGBE = new byte[width * 4];
+        float[] rgb = new float[3];
+
+        processImageStarted(imageIndex);
+
+        // Process one scanline of RGBE data at a time
+        for (int srcY = 0; srcY < height; srcY++) {
+            int dstY = ((srcY - srcRegion.y) / ySub) + destRegion.y;
+            if (dstY >= destRegion.height) {
+                break;
+            }
+
+            RGBE.readPixelsRawRLE(imageInput, rowRGBE, 0, width, 1);
+
+            if (srcY % ySub == 0 && dstY >= destRegion.y) {
+                for (int srcX = srcRegion.x; srcX < srcRegion.x + srcRegion.width; srcX += xSub) {
+                    int dstX = ((srcX - srcRegion.x) / xSub) + destRegion.x;
+                    if (dstX >= destRegion.width) {
+                        break;
+                    }
+
+                    RGBE.rgbe2float(rgb, rowRGBE, srcX * 4);
+
+                    // Map/clamp RGB values into visible range, normally [0...1]
+                    toneMapper.map(rgb);
+
+                    raster.setDataElements(dstX, dstY, rgb);
+                }
+            }
+
+            processImageProgress(srcY * 100f / height);
+
+            if (abortRequested()) {
+                processReadAborted();
+                break;
+            }
+        }
+
+        processImageComplete();
+
+        return destination;
+    }
+
+    @Override
+    public boolean canReadRaster() {
+        return true;
+    }
+
+    @Override
+    public Raster readRaster(final int imageIndex, final ImageReadParam param) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        int width = getWidth(imageIndex);
+        int height = getHeight(imageIndex);
+
+        Rectangle srcRegion = new Rectangle();
+        Rectangle destRegion = new Rectangle();
+        computeRegions(param, width, height, null, srcRegion, destRegion);
+        destRegion = srcRegion; // We don't really care about destination for raster
+
+        BufferedImage destination = new BufferedImage(srcRegion.width, srcRegion.height, BufferedImage.TYPE_4BYTE_ABGR);
+        WritableRaster raster = destination.getRaster();
+
+        int xSub = param != null ? param.getSourceXSubsampling() : 1;
+        int ySub = param != null ? param.getSourceYSubsampling() : 1;
+
+        byte[] rowRGBE = new byte[width * 4];
+        byte[] pixelRGBE = new byte[width];
+
+        processImageStarted(imageIndex);
+
+        // Process one scanline of RGBE data at a time
+        for (int srcY = 0; srcY < height; srcY++) {
+            int dstY = ((srcY - srcRegion.y) / ySub) + destRegion.y;
+            if (dstY >= destRegion.height) {
+                break;
+            }
+
+            RGBE.readPixelsRawRLE(imageInput, rowRGBE, 0, width, 1);
+
+            if (srcY % ySub == 0 && dstY >= destRegion.y) {
+                for (int srcX = srcRegion.x; srcX < srcRegion.x + srcRegion.width; srcX += xSub) {
+                    int dstX = ((srcX - srcRegion.x) / xSub) + destRegion.x;
+                    if (dstX >= destRegion.width) {
+                        break;
+                    }
+
+                    System.arraycopy(rowRGBE, srcX * 4, pixelRGBE, 0, 4);
+                    raster.setDataElements(dstX, dstY, pixelRGBE);
+                }
+            }
+
+            processImageProgress(srcY * 100f / height);
+
+            if (abortRequested()) {
+                processReadAborted();
+                break;
+            }
+        }
+
+        processImageComplete();
+
+        return destination.getRaster();
+    }
+
+    @Override
+    public ImageReadParam getDefaultReadParam() {
+        return new HDRImageReadParam();
+    }
+
+    @Override
+    public IIOMetadata getImageMetadata(int imageIndex) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        return new HDRMetadata(header);
+    }
+
+    public static void main(final String[] args) throws IOException {
+        File file = new File(args[0]);
+
+        BufferedImage image = ImageIO.read(file);
+
+        showIt(image, file.getName());
+    }
+}
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2015, 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.hdr;
+
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
+
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Locale;
+
+/**
+ * HDRImageReaderSpi.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: HDRImageReaderSpi.java,v 1.0 27/07/15 harald.kuhr Exp$
+ */
+public final class HDRImageReaderSpi extends ImageReaderSpiBase {
+    public HDRImageReaderSpi() {
+        super(new HDRProviderInfo());
+    }
+
+    @Override
+    public boolean canDecodeInput(final Object source) throws IOException {
+        if (!(source instanceof ImageInputStream)) {
+            return false;
+        }
+
+        ImageInputStream stream = (ImageInputStream) source;
+
+        stream.mark();
+
+        try {
+            // NOTE: All images I have found starts with #?RADIANCE (or has no #? line at all),
+            // although some sources claim that #?RGBE is also used.
+            byte[] magic = new byte[HDR.RADIANCE_MAGIC.length];
+            stream.readFully(magic);
+
+            return Arrays.equals(HDR.RADIANCE_MAGIC, magic)
+                    || Arrays.equals(HDR.RGBE_MAGIC, Arrays.copyOf(magic, 6));
+        }
+        finally {
+            stream.reset();
+        }
+    }
+
+    @Override
+    public ImageReader createReaderInstance(Object extension) throws IOException {
+        return new HDRImageReader(this);
+    }
+
+    @Override
+    public String getDescription(final Locale locale) {
+        return "Radiance RGBE High Dynaimc Range (HDR) image reader";
+    }
+}
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2015, 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.hdr;
+
+import com.twelvemonkeys.imageio.AbstractMetadata;
+
+import javax.imageio.metadata.IIOMetadataNode;
+
+final class HDRMetadata extends AbstractMetadata {
+    private final HDRHeader header;
+
+    HDRMetadata(final HDRHeader header) {
+        this.header = header;
+    }
+
+    @Override
+    protected IIOMetadataNode getStandardChromaNode() {
+        IIOMetadataNode chroma = new IIOMetadataNode("Chroma");
+
+        IIOMetadataNode csType = new IIOMetadataNode("ColorSpaceType");
+        chroma.appendChild(csType);
+        csType.setAttribute("name", "RGB");
+        // TODO: Support XYZ
+
+        IIOMetadataNode numChannels = new IIOMetadataNode("NumChannels");
+        numChannels.setAttribute("value", "3");
+        chroma.appendChild(numChannels);
+
+        IIOMetadataNode blackIsZero = new IIOMetadataNode("BlackIsZero");
+        blackIsZero.setAttribute("value", "TRUE");
+        chroma.appendChild(blackIsZero);
+
+        return chroma;
+    }
+
+    // No compression
+
+    @Override
+    protected IIOMetadataNode getStandardCompressionNode() {
+        IIOMetadataNode node = new IIOMetadataNode("Compression");
+
+        IIOMetadataNode compressionTypeName = new IIOMetadataNode("CompressionTypeName");
+        compressionTypeName.setAttribute("value", "RLE");
+        node.appendChild(compressionTypeName);
+
+        IIOMetadataNode lossless = new IIOMetadataNode("Lossless");
+        lossless.setAttribute("value", "TRUE");
+        node.appendChild(lossless);
+
+        return node;
+    }
+
+    @Override
+    protected IIOMetadataNode getStandardDataNode() {
+        IIOMetadataNode node = new IIOMetadataNode("Data");
+
+        IIOMetadataNode sampleFormat = new IIOMetadataNode("SampleFormat");
+        sampleFormat.setAttribute("value", "UnsignedIntegral");
+        node.appendChild(sampleFormat);
+
+        IIOMetadataNode bitsPerSample = new IIOMetadataNode("BitsPerSample");
+        bitsPerSample.setAttribute("value", "8 8 8 8");
+        node.appendChild(bitsPerSample);
+
+        return node;
+    }
+
+    @Override
+    protected IIOMetadataNode getStandardDimensionNode() {
+        IIOMetadataNode dimension = new IIOMetadataNode("Dimension");
+
+        // TODO: Support other orientations
+        IIOMetadataNode imageOrientation = new IIOMetadataNode("ImageOrientation");
+        imageOrientation.setAttribute("value", "Normal");
+        dimension.appendChild(imageOrientation);
+
+        return dimension;
+    }
+
+    // No document node
+
+    @Override
+    protected IIOMetadataNode getStandardTextNode() {
+        if (header.getSoftware() != null) {
+            IIOMetadataNode text = new IIOMetadataNode("Text");
+
+            IIOMetadataNode textEntry = new IIOMetadataNode("TextEntry");
+            textEntry.setAttribute("keyword", "Software");
+            textEntry.setAttribute("value", header.getSoftware());
+            text.appendChild(textEntry);
+
+            return text;
+        }
+
+        return null;
+    }
+
+    // No tiling
+
+    // No transparency
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2015, 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.hdr;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * HDRProviderInfo.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: HDRProviderInfo.java,v 1.0 27/07/15 harald.kuhr Exp$
+ */
+final class HDRProviderInfo extends ReaderWriterProviderInfo {
+    protected HDRProviderInfo() {
+        super(
+                HDRProviderInfo.class,
+                new String[] {"HDR", "hdr", "RGBE", "rgbe"},
+                new String[] {"hdr", "rgbe", "xyze", "pic"},
+                new String[] {"image/vnd.radiance"},
+                "com.twelvemonkeys.imageio.plugins.hdr.HDRImageReader",
+                new String[]{"com.twelvemonkeys.imageio.plugins.hdr.HDRImageReaderSpi"},
+                null,
+                null,
+                false, null, null, null, null,
+                true, null, null, null, null
+        );
+    }
+}
@@ -0,0 +1,494 @@
+package com.twelvemonkeys.imageio.plugins.hdr;
+
+import java.io.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * This file contains code to read and write four byte rgbe file format
+ * developed by Greg Ward.  It handles the conversions between rgbe and
+ * pixels consisting of floats.  The data is assumed to be an array of floats.
+ * By default there are three floats per pixel in the order red, green, blue.
+ * (RGBE_DATA_??? values control this.)  Only the mimimal header reading and
+ * writing is implemented.  Each routine does error checking and will return
+ * a status value as defined below.  This code is intended as a skeleton so
+ * feel free to modify it to suit your needs. <P>
+ * <p/>
+ * Ported to Java and restructured by Kenneth Russell. <BR>
+ * posted to http://www.graphics.cornell.edu/~bjw/ <BR>
+ * written by Bruce Walter  (bjw@graphics.cornell.edu)  5/26/95 <BR>
+ * based on code written by Greg Ward <BR>
+ * <p/>
+ * Source: https://java.net/projects/jogl-demos/sources/svn/content/trunk/src/demos/hdr/RGBE.java
+ */
+final class RGBE {
+    // Flags indicating which fields in a Header are valid
+    private static final int VALID_PROGRAMTYPE = 0x01;
+    private static final int VALID_GAMMA = 0x02;
+    private static final int VALID_EXPOSURE = 0x04;
+
+    private static final String gammaString = "GAMMA=";
+    private static final String exposureString = "EXPOSURE=";
+
+    private static final Pattern widthHeightPattern = Pattern.compile("-Y (\\d+) \\+X (\\d+)");
+
+    public static class Header {
+        // Indicates which fields are valid
+        private int valid;
+
+        // Listed at beginning of file to identify it after "#?".
+        // Defaults to "RGBE"
+        private String programType;
+
+        // Image has already been gamma corrected with given gamma.
+        // Defaults to 1.0 (no correction)
+        private float gamma;
+
+        // A value of 1.0 in an image corresponds to <exposure>
+        // watts/steradian/m^2. Defaults to 1.0.
+        private float exposure;
+
+        // Width and height of image
+        private int width;
+        private int height;
+
+        private Header(int valid,
+                       String programType,
+                       float gamma,
+                       float exposure,
+                       int width,
+                       int height) {
+            this.valid = valid;
+            this.programType = programType;
+            this.gamma = gamma;
+            this.exposure = exposure;
+            this.width = width;
+            this.height = height;
+        }
+
+        public boolean isProgramTypeValid() {
+            return ((valid & VALID_PROGRAMTYPE) != 0);
+        }
+
+        public boolean isGammaValid() {
+            return ((valid & VALID_GAMMA) != 0);
+        }
+
+        public boolean isExposureValid() {
+            return ((valid & VALID_EXPOSURE) != 0);
+        }
+
+        public String getProgramType() {
+            return programType;
+        }
+
+        public float getGamma() {
+            return gamma;
+        }
+
+        public float getExposure() {
+            return exposure;
+        }
+
+        public int getWidth() {
+            return width;
+        }
+
+        public int getHeight() {
+            return height;
+        }
+
+        public String toString() {
+            StringBuffer buf = new StringBuffer();
+            if (isProgramTypeValid()) {
+                buf.append(" Program type: ");
+                buf.append(getProgramType());
+            }
+            buf.append(" Gamma");
+            if (isGammaValid()) {
+                buf.append(" [valid]");
+            }
+            buf.append(": ");
+            buf.append(getGamma());
+            buf.append(" Exposure");
+            if (isExposureValid()) {
+                buf.append(" [valid]");
+            }
+            buf.append(": ");
+            buf.append(getExposure());
+            buf.append(" Width: ");
+            buf.append(getWidth());
+            buf.append(" Height: ");
+            buf.append(getHeight());
+            return buf.toString();
+        }
+    }
+
+    public static Header readHeader(final DataInput in) throws IOException {
+        int valid = 0;
+        String programType = null;
+        float gamma = 1.0f;
+        float exposure = 1.0f;
+        int width = 0;
+        int height = 0;
+
+        String buf = in.readLine();
+        if (buf == null) {
+            throw new IOException("Unexpected EOF reading magic token");
+        }
+        if (buf.charAt(0) == '#' && buf.charAt(1) == '?') {
+            valid |= VALID_PROGRAMTYPE;
+            programType = buf.substring(2);
+            buf = in.readLine();
+            if (buf == null) {
+                throw new IOException("Unexpected EOF reading line after magic token");
+            }
+        }
+
+        boolean foundFormat = false;
+        boolean done = false;
+        while (!done) {
+            if (buf.equals("FORMAT=32-bit_rle_rgbe")) {
+                foundFormat = true;
+            }
+            else if (buf.startsWith(gammaString)) {
+                valid |= VALID_GAMMA;
+                gamma = Float.parseFloat(buf.substring(gammaString.length()));
+            }
+            else if (buf.startsWith(exposureString)) {
+                valid |= VALID_EXPOSURE;
+                exposure = Float.parseFloat(buf.substring(exposureString.length()));
+            }
+            else {
+                Matcher m = widthHeightPattern.matcher(buf);
+                if (m.matches()) {
+                    width = Integer.parseInt(m.group(2));
+                    height = Integer.parseInt(m.group(1));
+                    done = true;
+                }
+            }
+
+            if (!done) {
+                buf = in.readLine();
+                if (buf == null) {
+                    throw new IOException("Unexpected EOF reading header");
+                }
+            }
+        }
+
+        if (!foundFormat) {
+            throw new IOException("No FORMAT specifier found");
+        }
+
+        return new Header(valid, programType, gamma, exposure, width, height);
+    }
+
+    /**
+     * Simple read routine.  Will not correctly handle run length encoding.
+     */
+    public static void readPixels(DataInput in, float[] data, int numpixels) throws IOException {
+        byte[] rgbe = new byte[4];
+        float[] rgb = new float[3];
+        int offset = 0;
+
+        while (numpixels-- > 0) {
+            in.readFully(rgbe);
+
+            rgbe2float(rgb, rgbe, 0);
+
+            data[offset++] = rgb[0];
+            data[offset++] = rgb[1];
+            data[offset++] = rgb[2];
+        }
+    }
+
+    public static void readPixelsRaw(DataInput in, byte[] data, int offset, int numpixels) throws IOException {
+        int numExpected = 4 * numpixels;
+        in.readFully(data, offset, numExpected);
+    }
+
+    public static void readPixelsRawRLE(DataInput in, byte[] data, int offset,
+                                        int scanline_width, int num_scanlines) throws IOException {
+        byte[] rgbe = new byte[4];
+        byte[] scanline_buffer = null;
+        int ptr, ptr_end;
+        int count;
+        byte[] buf = new byte[2];
+
+        if ((scanline_width < 8) || (scanline_width > 0x7fff)) {
+            // run length encoding is not allowed so read flat
+            readPixelsRaw(in, data, offset, scanline_width * num_scanlines);
+        }
+
+        // read in each successive scanline
+        while (num_scanlines > 0) {
+            in.readFully(rgbe);
+
+            if ((rgbe[0] != 2) || (rgbe[1] != 2) || ((rgbe[2] & 0x80) != 0)) {
+                // this file is not run length encoded
+                data[offset++] = rgbe[0];
+                data[offset++] = rgbe[1];
+                data[offset++] = rgbe[2];
+                data[offset++] = rgbe[3];
+                readPixelsRaw(in, data, offset, scanline_width * num_scanlines - 1);
+            }
+
+            if ((((rgbe[2] & 0xFF) << 8) | (rgbe[3] & 0xFF)) != scanline_width) {
+                throw new IOException("Wrong scanline width " +
+                        (((rgbe[2] & 0xFF) << 8) | (rgbe[3] & 0xFF)) +
+                        ", expected " + scanline_width);
+            }
+
+            if (scanline_buffer == null) {
+                scanline_buffer = new byte[4 * scanline_width];
+            }
+
+            ptr = 0;
+            // read each of the four channels for the scanline into the buffer
+            for (int i = 0; i < 4; i++) {
+                ptr_end = (i + 1) * scanline_width;
+                while (ptr < ptr_end) {
+                    in.readFully(buf);
+
+                    if ((buf[0] & 0xFF) > 128) {
+                        // a run of the same value
+                        count = (buf[0] & 0xFF) - 128;
+                        if ((count == 0) || (count > ptr_end - ptr)) {
+                            throw new IOException("Bad scanline data");
+                        }
+                        while (count-- > 0) {
+                            scanline_buffer[ptr++] = buf[1];
+                        }
+                    }
+                    else {
+                        // a non-run
+                        count = buf[0] & 0xFF;
+                        if ((count == 0) || (count > ptr_end - ptr)) {
+                            throw new IOException("Bad scanline data");
+                        }
+                        scanline_buffer[ptr++] = buf[1];
+                        if (--count > 0) {
+                            in.readFully(scanline_buffer, ptr, count);
+                            ptr += count;
+                        }
+                    }
+                }
+            }
+            // copy byte data to output
+            for (int i = 0; i < scanline_width; i++) {
+                data[offset++] = scanline_buffer[i];
+                data[offset++] = scanline_buffer[i + scanline_width];
+                data[offset++] = scanline_buffer[i + 2 * scanline_width];
+                data[offset++] = scanline_buffer[i + 3 * scanline_width];
+            }
+            num_scanlines--;
+        }
+    }
+
+    /**
+     * Standard conversion from float pixels to rgbe pixels.
+     */
+    public static void float2rgbe(byte[] rgbe, float red, float green, float blue) {
+        float v;
+        int e;
+
+        v = red;
+        if (green > v) {
+            v = green;
+        }
+        if (blue > v) {
+            v = blue;
+        }
+        if (v < 1e-32f) {
+            rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0;
+        }
+        else {
+            FracExp fe = frexp(v);
+            v = (float) (fe.getFraction() * 256.0 / v);
+            rgbe[0] = (byte) (red * v);
+            rgbe[1] = (byte) (green * v);
+            rgbe[2] = (byte) (blue * v);
+            rgbe[3] = (byte) (fe.getExponent() + 128);
+        }
+    }
+
+    /**
+     * Standard conversion from rgbe to float pixels.  Note: Ward uses
+     * ldexp(col+0.5,exp-(128+8)). However we wanted pixels in the
+     * range [0,1] to map back into the range [0,1].
+     */
+    public static void rgbe2float(float[] rgb, byte[] rgbe, int startRGBEOffset) {
+        float f;
+
+        if (rgbe[startRGBEOffset + 3] != 0) {   // nonzero pixel
+            f = (float) ldexp(1.0, (rgbe[startRGBEOffset + 3] & 0xFF) - (128 + 8));
+            rgb[0] = (rgbe[startRGBEOffset + 0] & 0xFF) * f;
+            rgb[1] = (rgbe[startRGBEOffset + 1] & 0xFF) * f;
+            rgb[2] = (rgbe[startRGBEOffset + 2] & 0xFF) * f;
+        }
+        else {
+            rgb[0] = 0;
+            rgb[1] = 0;
+            rgb[2] = 0;
+        }
+    }
+
+    public static double ldexp(double value, int exp) {
+        if (!finite(value) || value == 0.0) {
+            return value;
+        }
+        value = scalbn(value, exp);
+        // No good way to indicate errno (want to avoid throwing
+        // exceptions because don't know about stability of calculations)
+        // if(!finite(value)||value==0.0) errno = ERANGE;
+        return value;
+    }
+
+    //----------------------------------------------------------------------
+    // Internals only below this point
+    //
+
+    //----------------------------------------------------------------------
+    // Math routines, some fdlibm-derived
+    //
+
+    static class FracExp {
+        private double fraction;
+        private int exponent;
+
+        public FracExp(double fraction, int exponent) {
+            this.fraction = fraction;
+            this.exponent = exponent;
+        }
+
+        public double getFraction() {
+            return fraction;
+        }
+
+        public int getExponent() {
+            return exponent;
+        }
+    }
+
+    private static final double two54 = 1.80143985094819840000e+16;  // 43500000 00000000
+    private static final double twom54 = 5.55111512312578270212e-17;  // 0x3C900000 0x00000000
+    private static final double huge = 1.0e+300;
+    private static final double tiny = 1.0e-300;
+
+    private static int hi(double x) {
+        long bits = Double.doubleToRawLongBits(x);
+        return (int) (bits >>> 32);
+    }
+
+    private static int lo(double x) {
+        long bits = Double.doubleToRawLongBits(x);
+        return (int) bits;
+    }
+
+    private static double fromhilo(int hi, int lo) {
+        return Double.longBitsToDouble((((long) hi) << 32) |
+                (((long) lo) & 0xFFFFFFFFL));
+    }
+
+    private static FracExp frexp(double x) {
+        int hx = hi(x);
+        int ix = 0x7fffffff & hx;
+        int lx = lo(x);
+        int e = 0;
+        if (ix >= 0x7ff00000 || ((ix | lx) == 0)) {
+            return new FracExp(x, e);         // 0,inf,nan
+        }
+        if (ix < 0x00100000) {                // subnormal
+            x *= two54;
+            hx = hi(x);
+            ix = hx & 0x7fffffff;
+            e = -54;
+        }
+        e += (ix >> 20) - 1022;
+        hx = (hx & 0x800fffff) | 0x3fe00000;
+        lx = lo(x);
+        return new FracExp(fromhilo(hx, lx), e);
+    }
+
+    private static boolean finite(double x) {
+        int hx;
+        hx = hi(x);
+        return (((hx & 0x7fffffff) - 0x7ff00000) >> 31) != 0;
+    }
+
+    /**
+     * copysign(double x, double y) <BR>
+     * copysign(x,y) returns a value with the magnitude of x and
+     * with the sign bit of y.
+     */
+    private static double copysign(double x, double y) {
+        return fromhilo((hi(x) & 0x7fffffff) | (hi(y) & 0x80000000), lo(x));
+    }
+
+    /**
+     * scalbn (double x, int n) <BR>
+     * scalbn(x,n) returns x* 2**n  computed by  exponent
+     * manipulation rather than by actually performing an
+     * exponentiation or a multiplication.
+     */
+    private static double scalbn(double x, int n) {
+        int hx = hi(x);
+        int lx = lo(x);
+        int k = (hx & 0x7ff00000) >> 20;         // extract exponent
+        if (k == 0) {                          // 0 or subnormal x
+            if ((lx | (hx & 0x7fffffff)) == 0) {
+                return x; // +-0
+            }
+            x *= two54;
+            hx = hi(x);
+            k = ((hx & 0x7ff00000) >> 20) - 54;
+            if (n < -50000) {
+                return tiny * x;                   // underflow
+            }
+        }
+        if (k == 0x7ff) {
+            return x + x;                        // NaN or Inf
+        }
+        k = k + n;
+        if (k > 0x7fe) {
+            return huge * copysign(huge, x);      // overflow
+        }
+        if (k > 0) {
+            // normal result
+            return fromhilo((hx & 0x800fffff) | (k << 20), lo(x));
+        }
+        if (k <= -54) {
+            if (n > 50000) {
+                // in case integer overflow in n+k
+                return huge * copysign(huge, x);  // overflow
+            }
+            else {
+                return tiny * copysign(tiny, x);    // underflow
+            }
+        }
+        k += 54;                             // subnormal result
+        x = fromhilo((hx & 0x800fffff) | (k << 20), lo(x));
+        return x * twom54;
+    }
+
+    //----------------------------------------------------------------------
+    // Test harness
+    //
+
+    public static void main(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            try {
+                DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(args[i])));
+                Header header = RGBE.readHeader(in);
+                System.err.println("Header for file \"" + args[i] + "\":");
+                System.err.println("  " + header);
+                byte[] data = new byte[header.getWidth() * header.getHeight() * 4];
+                readPixelsRawRLE(in, data, 0, header.getWidth(), header.getHeight());
+                in.close();
+            }
+            catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015, 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.hdr.tonemap;
+
+/**
+ * DefaultToneMapper.
+ * <p/>
+ * Normalizes values to range [0...1] using:
+ *
+ * <p><em>V<sub>out</sub> =  V<sub>in</sub> / (V<sub>in</sub> + C)</em></p>
+ *
+ * Where <em>C</em> is constant.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: DefaultToneMapper.java,v 1.0 28/07/15 harald.kuhr Exp$
+ */
+public final class DefaultToneMapper implements ToneMapper {
+
+    private final float constant;
+
+    public DefaultToneMapper() {
+        this(1);
+    }
+
+    public DefaultToneMapper(final float constant) {
+        this.constant = constant;
+    }
+
+    @Override
+    public void map(final float[] rgb) {
+        // Default Vo =  Vi / (Vi + 1)
+        for (int i = 0; i < rgb.length; i++) {
+            rgb[i] = rgb[i] / (rgb[i] + constant);
+        }
+    }
+}
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015, 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.hdr.tonemap;
+
+/**
+ * GammaToneMapper.
+ * <p/>
+ * Normalizes values to range [0...1] using:
+ *
+ * <p><em>V<sub>out</sub> = A V<sub>in</sub><sup>\u03b3</sup></em></p>
+ *
+ * Where <em>A</em> is constant and <em>\u03b3</em> is the gamma.
+ * Values > 1 are clamped.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: GammaToneMapper.java,v 1.0 28/07/15 harald.kuhr Exp$
+ */
+public final class GammaToneMapper implements ToneMapper {
+
+    private final float constant;
+    private final float gamma;
+
+    public GammaToneMapper() {
+        this(0.5f, .25f);
+    }
+
+    public GammaToneMapper(final float constant, final float gamma) {
+        this.constant = constant;
+        this.gamma = gamma;
+    }
+
+    @Override
+    public void map(final float[] rgb) {
+        // Gamma Vo = A * Vi^y
+        for (int i = 0; i < rgb.length; i++) {
+            rgb[i] = Math.min(1f, (float) (constant * Math.pow(rgb[i], gamma)));
+        }
+    }
+}
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015, 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.hdr.tonemap;
+
+/**
+ * NullToneMapper.
+ * <p/>
+ * This {@code ToneMapper} does *not* normalize or clamp values
+ * to range [0...1], but leaves the values as-is.
+ * Useful for applications that implements custom tone mapping.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: NullToneMapper.java,v 1.0 28/07/15 harald.kuhr Exp$
+ */
+public final class NullToneMapper implements ToneMapper {
+    @Override
+    public void map(float[] rgb) {
+    }
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2015, 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.hdr.tonemap;
+
+/**
+ * ToneMapper.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: ToneMapper.java,v 1.0 28/07/15 harald.kuhr Exp$
+ */
+public interface ToneMapper {
+    void map(float[] rgb);
+}
@@ -0,0 +1 @@
+com.twelvemonkeys.imageio.plugins.hdr.HDRImageReaderSpi
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2015, 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.hdr;
+
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
+
+import javax.imageio.spi.ImageReaderSpi;
+import java.awt.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * TGAImageReaderTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: TGAImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$
+ */
+public class HDRImageReaderTest extends ImageReaderAbstractTest<HDRImageReader> {
+    @Override
+    protected List<TestData> getTestData() {
+        return Arrays.asList(
+                new TestData(getClassLoaderResource("/hdr/memorial_o876.hdr"), new Dimension(512, 768))
+        );
+    }
+
+    @Override
+    protected ImageReaderSpi createProvider() {
+        return new HDRImageReaderSpi();
+    }
+
+    @Override
+    protected Class<HDRImageReader> getReaderClass() {
+        return HDRImageReader.class;
+    }
+
+    @Override
+    protected HDRImageReader createReader() {
+        return new HDRImageReader(createProvider());
+    }
+
+    @Override
+    protected List<String> getFormatNames() {
+        return Arrays.asList("HDR", "hdr", "RGBE", "rgbe");
+    }
+
+    @Override
+    protected List<String> getSuffixes() {
+        return Arrays.asList("hdr", "rgbe", "xyze");
+    }
+
+    @Override
+    protected List<String> getMIMETypes() {
+        return Collections.singletonList(
+                "image/vnd.radiance"
+        );
+    }
+}
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-icns</artifactId>
    <name>TwelveMonkeys :: ImageIO :: ICNS plugin</name>
@@ -18,7 +18,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-iff</artifactId>
    <name>TwelveMonkeys :: ImageIO :: IFF plugin</name>
@@ -21,7 +21,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-jpeg</artifactId>
    <name>TwelveMonkeys :: ImageIO :: JPEG plugin</name>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
@@ -28,6 +28,7 @@

 package com.twelvemonkeys.imageio.plugins.jpeg;

+import com.twelvemonkeys.imageio.color.YCbCrConverter;
 import com.twelvemonkeys.imageio.metadata.Directory;
 import com.twelvemonkeys.imageio.metadata.Entry;
 import com.twelvemonkeys.imageio.metadata.exif.TIFF;
@@ -102,7 +103,7 @@ final class EXIFThumbnailReader extends ThumbnailReader {
            thumbnail = readJPEG();
        }

-        cachedThumbnail = pixelsExposed ? null : new SoftReference<BufferedImage>(thumbnail);
+        cachedThumbnail = pixelsExposed ? null : new SoftReference<>(thumbnail);

        return thumbnail;
    }
@@ -132,14 +133,10 @@ final class EXIFThumbnailReader extends ThumbnailReader {
            input = new SequenceInputStream(new ByteArrayInputStream(fakeEmptyExif), input);

            try {
-                MemoryCacheImageInputStream stream = new MemoryCacheImageInputStream(input);

-                try {
+                try (MemoryCacheImageInputStream stream = new MemoryCacheImageInputStream(input)) {
                    return readJPEGThumbnail(reader, stream);
                }
-                finally {
-                    stream.close();
-                }
            }
            finally {
                input.close();
@@ -195,15 +192,15 @@ final class EXIFThumbnailReader extends ThumbnailReader {
                    break;
                case 6:
                    // YCbCr
-                    for (int i = 0, thumbDataLength = thumbData.length; i < thumbDataLength; i += 3) {
-                        JPEGImageReader.YCbCrConverter.convertYCbCr2RGB(thumbData, thumbData, i);
+                    for (int i = 0; i < thumbSize; i += 3) {
+                        YCbCrConverter.convertYCbCr2RGB(thumbData, thumbData, i);
                    }
                    break;
                default:
                    throw new IIOException("Unknown PhotometricInterpretation value for uncompressed EXIF thumbnail (expected 2 or 6): " + interpretation);
            }

-            return ThumbnailReader.readRawThumbnail(thumbData, thumbData.length, 0, w, h);
+            return ThumbnailReader.readRawThumbnail(thumbData, thumbSize, 0, w, h);
        }

        throw new IIOException("Missing StripOffsets tag for uncompressed EXIF thumbnail");
@@ -28,9 +28,9 @@

 package com.twelvemonkeys.imageio.plugins.jpeg;

-import com.twelvemonkeys.image.ImageUtil;
 import com.twelvemonkeys.imageio.ImageReaderBase;
 import com.twelvemonkeys.imageio.color.ColorSpaces;
+import com.twelvemonkeys.imageio.color.YCbCrConverter;
 import com.twelvemonkeys.imageio.metadata.CompoundDirectory;
 import com.twelvemonkeys.imageio.metadata.Directory;
 import com.twelvemonkeys.imageio.metadata.Entry;
@@ -152,10 +152,10 @@ public class JPEGImageReader extends ImageReaderBase {
    /** Cached list of JPEG segments we filter from the underlying stream */
    private List<JPEGSegment> segments;

-    JPEGImageReader(final ImageReaderSpi provider, final ImageReader delegate) {
+    protected JPEGImageReader(final ImageReaderSpi provider, final ImageReader delegate) {
        super(provider);
-        this.delegate = Validate.notNull(delegate);

+        this.delegate = Validate.notNull(delegate);
        progressDelegator = new ProgressDelegator();
    }

@@ -268,10 +268,15 @@ public class JPEGImageReader extends ImageReaderBase {
    @Override
    public ImageTypeSpecifier getRawImageType(int imageIndex) throws IOException {
        // If delegate can determine the spec, we'll just go with that
-        ImageTypeSpecifier rawType = delegate.getRawImageType(imageIndex);
+        try {
+            ImageTypeSpecifier rawType = delegate.getRawImageType(imageIndex);

-        if (rawType != null) {
-            return rawType;
+            if (rawType != null) {
+                return rawType;
+            }
+        }
+        catch (NullPointerException ignore) {
+            // Fall through
        }

        // Otherwise, consult the image metadata
@@ -298,7 +303,9 @@ public class JPEGImageReader extends ImageReaderBase {
        super.setInput(input, seekForwardOnly, ignoreMetadata);

        // JPEGSegmentImageInputStream that filters out/skips bad/unnecessary segments
-        delegate.setInput(imageInput != null ? new JPEGSegmentImageInputStream(imageInput) : null, seekForwardOnly, ignoreMetadata);
+        delegate.setInput(imageInput != null
+                          ? new JPEGSegmentImageInputStream(imageInput)
+                          : null, seekForwardOnly, ignoreMetadata);
    }

    @Override
@@ -311,22 +318,10 @@ public class JPEGImageReader extends ImageReaderBase {
        assertInput();
        checkBounds(imageIndex);

-//        CompoundDirectory exif = getExif();
-//        if (exif != null) {
-//            System.err.println("exif: " + exif);
-//            System.err.println("Orientation: " + exif.getEntryById(TIFF.TAG_ORIENTATION));
-//            Entry exifIFDEntry = exif.getEntryById(TIFF.TAG_EXIF_IFD);
-//
-//            if (exifIFDEntry != null) {
-//                Directory exifIFD = (Directory) exifIFDEntry.getValue();
-//                System.err.println("PixelXDimension: " + exifIFD.getEntryById(EXIF.TAG_PIXEL_X_DIMENSION));
-//                System.err.println("PixelYDimension: " + exifIFD.getEntryById(EXIF.TAG_PIXEL_Y_DIMENSION));
-//            }
-//        }
-
        SOFSegment sof = getSOF();
        ICC_Profile profile = getEmbeddedICCProfile(false);
        AdobeDCTSegment adobeDCT = getAdobeDCT();
+        boolean bogusAdobeDCT = false;

        if (adobeDCT != null && (adobeDCT.getTransform() == AdobeDCTSegment.YCC && sof.componentsInFrame() != 3 ||
                adobeDCT.getTransform() == AdobeDCTSegment.YCCK && sof.componentsInFrame() != 4)) {
@@ -337,6 +332,7 @@ public class JPEGImageReader extends ImageReaderBase {
                    sof.marker & 0xf, sof.componentsInFrame()
            ));

+            bogusAdobeDCT = true;
            adobeDCT = null;
        }

@@ -345,11 +341,11 @@ public class JPEGImageReader extends ImageReaderBase {
        // We need to apply ICC profile unless the profile is sRGB/default gray (whatever that is)
        // - or only filter out the bad ICC profiles in the JPEGSegmentImageInputStream.
        if (delegate.canReadRaster() && (
+                bogusAdobeDCT ||
                sourceCSType == JPEGColorSpace.CMYK ||
                sourceCSType == JPEGColorSpace.YCCK ||
-                adobeDCT != null && adobeDCT.getTransform() == AdobeDCTSegment.YCCK ||
-                profile != null && !ColorSpaces.isCS_sRGB(profile)) ||
-                sourceCSType == JPEGColorSpace.YCbCr && getRawImageType(imageIndex) != null) { // TODO: Issue warning?
+                profile != null && !ColorSpaces.isCS_sRGB(profile) ||
+                sourceCSType == JPEGColorSpace.YCbCr && getRawImageType(imageIndex) != null)) { // TODO: Issue warning?
            if (DEBUG) {
                System.out.println("Reading using raster and extra conversion");
                System.out.println("ICC color profile: " + profile);
@@ -408,6 +404,7 @@ public class JPEGImageReader extends ImageReaderBase {
                if (DEBUG) {
                    System.err.println("Converting from " + intendedCS + " to " + (image.getColorModel().getColorSpace().isCS_sRGB() ? "sRGB" : image.getColorModel().getColorSpace()));
                }
+
                convert = new ColorConvertOp(intendedCS, image.getColorModel().getColorSpace(), null);
            }
            // Else, pass through with no conversion
@@ -466,15 +463,13 @@ public class JPEGImageReader extends ImageReaderBase {

            // Apply source color conversion from implicit color space
            if (csType == JPEGColorSpace.YCbCr || csType == JPEGColorSpace.YCbCrA) {
-                YCbCrConverter.convertYCbCr2RGB(raster);
+                convertYCbCr2RGB(raster);
            }
            else if (csType == JPEGColorSpace.YCCK) {
-                YCbCrConverter.convertYCCK2CMYK(raster);
+                // TODO: Need to rethink this (non-) inversion, see #147
+                // TODO: Allow param to specify inversion, or possibly the PDF decode array
                // flag0 bit 15, blend = 1 see http://graphicdesign.stackexchange.com/questions/12894/cmyk-jpegs-extracted-from-pdf-appear-inverted
-                if ((getAdobeDCT().flags0 & 0x8000) != 0) {
-                    /// TODO: Better yet would be to not inverting in the first place, add flag to convertYCCK2CMYK
-                    invertCMYK(raster);
-                }
+                convertYCCK2CMYK(raster);
            }
            else if (csType == JPEGColorSpace.CMYK) {
                invertCMYK(raster);
@@ -629,7 +624,7 @@ public class JPEGImageReader extends ImageReaderBase {
        }
    }

-    private ICC_Profile ensureDisplayProfile(final ICC_Profile profile) {
+    protected ICC_Profile ensureDisplayProfile(final ICC_Profile profile) {
        // NOTE: This is probably not the right way to do it... :-P
        // TODO: Consider moving method to ColorSpaces class or new class in imageio.color package

@@ -835,7 +830,7 @@ public class JPEGImageReader extends ImageReaderBase {
        return data;
    }

-    ICC_Profile getEmbeddedICCProfile(final boolean allowBadIndexes) throws IOException {
+    protected ICC_Profile getEmbeddedICCProfile(final boolean allowBadIndexes) throws IOException {
        // ICC v 1.42 (2006) annex B:
        // APP2 marker (0xFFE2) + 2 byte length + ASCII 'ICC_PROFILE' + 0 (termination)
        // + 1 byte chunk number + 1 byte chunk count (allows ICC profiles chunked in multiple APP2 segments)
@@ -857,7 +852,7 @@ public class JPEGImageReader extends ImageReaderBase {
                return null;
            }

-            return readICCProfileSafe(stream);
+            return readICCProfileSafe(stream, allowBadIndexes);
        }
        else if (!segments.isEmpty()) {
            // NOTE: This is probably over-complicated, as I've never encountered ICC_PROFILE chunks out of order...
@@ -904,15 +899,17 @@ public class JPEGImageReader extends ImageReaderBase {
                streams[badICC ? i : chunkNumber - 1] = stream;
            }

-            return readICCProfileSafe(new SequenceInputStream(Collections.enumeration(Arrays.asList(streams))));
+            return readICCProfileSafe(new SequenceInputStream(Collections.enumeration(Arrays.asList(streams))), allowBadIndexes);
        }

        return null;
    }

-    private ICC_Profile readICCProfileSafe(final InputStream stream) throws IOException {
+    private ICC_Profile readICCProfileSafe(final InputStream stream, final boolean allowBadProfile) throws IOException {
        try {
-            return ICC_Profile.getInstance(stream);
+            ICC_Profile profile = ICC_Profile.getInstance(stream);
+
+            return allowBadProfile ? profile : ColorSpaces.validateProfile(profile);
        }
        catch (RuntimeException e) {
            // NOTE: Throws either IllegalArgumentException or CMMException, depending on platform.
@@ -944,6 +941,11 @@ public class JPEGImageReader extends ImageReaderBase {
        delegate.abort();
    }

+    @Override
+    public ImageReadParam getDefaultReadParam() {
+        return delegate.getDefaultReadParam();
+    }
+
    @Override
    public boolean readerSupportsThumbnails() {
        return true; // We support EXIF, JFIF and JFXX style thumbnails
@@ -1105,105 +1107,32 @@ public class JPEGImageReader extends ImageReaderBase {
        }
    }

-    /**
-     * Static inner class for lazy-loading of conversion tables.
-     *
-     * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
-     * @author Original code by Werner Randelshofer
-     */
-    static final class YCbCrConverter {
-        /** Define tables for YCC->RGB color space conversion. */
-        private final static int SCALEBITS = 16;
-        private final static int MAXJSAMPLE = 255;
-        private final static int CENTERJSAMPLE = 128;
-        private final static int ONE_HALF = 1 << (SCALEBITS - 1);
+    public static void convertYCbCr2RGB(final Raster raster) {
+        final int height = raster.getHeight();
+        final int width = raster.getWidth();
+        final byte[] data = ((DataBufferByte) raster.getDataBuffer()).getData();

-        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 (DEBUG) {
-                System.err.println("Building YCC 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;
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                YCbCrConverter.convertYCbCr2RGB(data, data, (x + y * width) * 3);
            }
        }
+    }

-        static {
-            buildYCCtoRGBtable();
-        }
+    public static void convertYCCK2CMYK(final Raster raster) {
+        final int height = raster.getHeight();
+        final int width = raster.getWidth();
+        final byte[] data = ((DataBufferByte) raster.getDataBuffer()).getData();

-        static void convertYCbCr2RGB(final Raster raster) {
-            final int height = raster.getHeight();
-            final int width = raster.getWidth();
-            final byte[] data = ((DataBufferByte) raster.getDataBuffer()).getData();
-
-            for (int y = 0; y < height; y++) {
-                for (int x = 0; x < width; x++) {
-                    convertYCbCr2RGB(data, data, (x + y * width) * 3);
-                }
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int offset = (x + y * width) * 4;
+                // YCC -> CMY
+                YCbCrConverter.convertYCbCr2RGB(data, data, offset);
+                // Inverse K
+                data[offset + 3] = (byte) (0xff - data[offset + 3] & 0xff);
            }
        }
-
-        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 + 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]);
-        }
-
-        static void convertYCCK2CMYK(final Raster raster) {
-            final int height = raster.getHeight();
-            final int width = raster.getWidth();
-            final byte[] data = ((DataBufferByte) raster.getDataBuffer()).getData();
-
-            for (int y = 0; y < height; y++) {
-                for (int x = 0; x < width; x++) {
-                    convertYCCK2CMYK(data, data, (x + y * width) * 4);
-                }
-            }
-        }
-
-        private static void convertYCCK2CMYK(byte[] ycck, byte[] cmyk, int offset) {
-            // Inverted
-            int y  = 255 - ycck[offset    ] & 0xff;
-            int cb = 255 - ycck[offset + 1] & 0xff;
-            int cr = 255 - ycck[offset + 2] & 0xff;
-            int k  = 255 - ycck[offset + 3] & 0xff;
-
-            int cmykC = MAXJSAMPLE - (y + Cr_R_LUT[cr]);
-            int cmykM = MAXJSAMPLE - (y + (Cb_G_LUT[cb] + Cr_G_LUT[cr] >> SCALEBITS));
-            int cmykY = MAXJSAMPLE - (y + Cb_B_LUT[cb]);
-
-            cmyk[offset    ] = clamp(cmykC);
-            cmyk[offset + 1] = clamp(cmykM);
-            cmyk[offset + 2] = clamp(cmykY);
-            cmyk[offset + 3] = (byte) k; // K passes through unchanged
-        }
-
-        private static byte clamp(int val) {
-            return (byte) Math.max(0, Math.min(255, val));
-        }
    }

    private class ProgressDelegator extends ProgressListenerBase implements IIOReadUpdateListener, IIOReadWarningListener {
@@ -1301,7 +1230,68 @@ public class JPEGImageReader extends ImageReaderBase {
    }

    public static void main(final String[] args) throws IOException {
-        for (final String arg : args) {
+        ImageIO.setUseCache(false);
+
+        int subX = 1;
+        int subY = 1;
+        int xOff = 0;
+        int yOff = 0;
+        Rectangle roi = null;
+        boolean metadata = false;
+        boolean thumbnails = false;
+
+        for (int argIdx = 0; argIdx < args.length; argIdx++) {
+            final String arg = args[argIdx];
+
+            if (arg.charAt(0) == '-') {
+                if (arg.equals("-s") || arg.equals("--subsample") && args.length > argIdx) {
+                    String[] sub = args[++argIdx].split(",");
+
+                    try {
+                        if (sub.length >= 4) {
+                            subX = Integer.parseInt(sub[0]);
+                            subY = Integer.parseInt(sub[1]);
+                            xOff = Integer.parseInt(sub[2]);
+                            yOff = Integer.parseInt(sub[3]);
+                        }
+                        else {
+                            subX = Integer.parseInt(sub[0]);
+                            subY = sub.length > 1 ? Integer.parseInt(sub[1]) : subX;
+                        }
+                    }
+                    catch (NumberFormatException e) {
+                        System.err.println("Bad sub sampling (x,y): '" + args[argIdx] + "'");
+                    }
+                }
+                else if (arg.equals("-r") || arg.equals("--roi") && args.length > argIdx) {
+                    String[] region = args[++argIdx].split(",");
+
+                    try {
+                        if (region.length >= 4) {
+                            roi = new Rectangle(Integer.parseInt(region[0]), Integer.parseInt(region[2]), Integer.parseInt(region[2]), Integer.parseInt(region[3]));
+                        }
+                        else {
+                            roi = new Rectangle(Integer.parseInt(region[0]), Integer.parseInt(region[2]));
+                        }
+                    }
+                    catch (IndexOutOfBoundsException | NumberFormatException e) {
+                        System.err.println("Bad source region ([x,y,]w, h): '" + args[argIdx] + "'");
+                    }
+                }
+                else if (arg.equals("-m") || arg.equals("--metadata")) {
+                    metadata = true;
+                }
+                else if (arg.equals("-t") || arg.equals("--thumbnails")) {
+                    thumbnails = true;
+                }
+                else {
+                    System.err.println("Unknown argument: '" + arg + "'");
+                    System.exit(-1);
+                }
+
+                continue;
+            }
+
            File file = new File(arg);

            ImageInputStream input = ImageIO.createImageInputStream(file);
@@ -1317,15 +1307,15 @@ public class JPEGImageReader extends ImageReaderBase {
                continue;
            }

-            ImageReader reader = readers.next();
-//            System.err.println("Reading using: " + reader);
+            final ImageReader reader = readers.next();
+            System.err.println("Reading using: " + reader);

            reader.addIIOReadWarningListener(new IIOReadWarningListener() {
                public void warningOccurred(ImageReader source, String warning) {
                    System.err.println("Warning: " + arg + ": " + warning);
                }
            });
-            reader.addIIOReadProgressListener(new ProgressListenerBase() {
+            final ProgressListenerBase listener = new ProgressListenerBase() {
                private static final int MAX_W = 78;
                int lastProgress = 0;

@@ -1354,29 +1344,35 @@ public class JPEGImageReader extends ImageReaderBase {

                    System.out.println("]");
                }
-            });
+            };
+            reader.addIIOReadProgressListener(listener);

            reader.setInput(input);

-            // For a tables-only image, we can't read image, but we should get metadata.
-            if (reader.getNumImages(true) == 0) {
-                IIOMetadata streamMetadata = reader.getStreamMetadata();
-                IIOMetadataNode streamNativeTree = (IIOMetadataNode) streamMetadata.getAsTree(streamMetadata.getNativeMetadataFormatName());
-                new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(streamNativeTree, false);
-                continue;
-            }
-
            try {
+                // For a tables-only image, we can't read image, but we should get metadata.
+                if (reader.getNumImages(true) == 0) {
+                    IIOMetadata streamMetadata = reader.getStreamMetadata();
+                    IIOMetadataNode streamNativeTree = (IIOMetadataNode) streamMetadata.getAsTree(streamMetadata.getNativeMetadataFormatName());
+                    new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(streamNativeTree, false);
+                    continue;
+                }
+
+                BufferedImage image;
                ImageReadParam param = reader.getDefaultReadParam();
-//            if (args.length > 1) {
-//                int sub = Integer.parseInt(args[1]);
-//                int sub = 4;
-//                param.setSourceSubsampling(sub, sub, 0, 0);
-//            }
-                BufferedImage image = reader.getImageTypes(0).next().createBufferedImage(reader.getWidth(0), reader.getHeight(0));
+                if (subX > 1 || subY > 1 || roi != null) {
+                    param.setSourceSubsampling(subX, subY, xOff, yOff);
+                    param.setSourceRegion(roi);
+
+                    image = reader.getImageTypes(0).next().createBufferedImage((reader.getWidth(0) + subX - 1)/ subX, (reader.getHeight(0) + subY - 1) / subY);
+                }
+                else {
+                    image = reader.getImageTypes(0).next().createBufferedImage(reader.getWidth(0), reader.getHeight(0));
+                }
                param.setDestination(image);

-//                long start = System.currentTimeMillis();
+                long start = DEBUG ? System.currentTimeMillis() : 0;
+
                try {
                    image = reader.read(0, param);
                }
@@ -1387,12 +1383,13 @@ public class JPEGImageReader extends ImageReaderBase {
                        continue;
                    }
                }
-//                System.err.println("Read time: " + (System.currentTimeMillis() - start) + " ms");
-//                System.err.println("image: " + image);

+                if (DEBUG) {
+                    System.err.println("Read time: " + (System.currentTimeMillis() - start) + " ms");
+                    System.err.println("image: " + image);
+                }

-//            image = new ResampleOp(reader.getWidth(0) / 4, reader.getHeight(0) / 4, ResampleOp.FILTER_LANCZOS).filter(image, null);
-
+                /*
                int maxW = 1280;
                int maxH = 800;
                if (image.getWidth() > maxW || image.getHeight() > maxH) {
@@ -1406,34 +1403,45 @@ public class JPEGImageReader extends ImageReaderBase {
                    }
 //                    System.err.println("Scale time: " + (System.currentTimeMillis() - start) + " ms");
                }
+                */

                showIt(image, String.format("Image: %s [%d x %d]", file.getName(), reader.getWidth(0), reader.getHeight(0)));

-                try {
-                    IIOMetadata imageMetadata = reader.getImageMetadata(0);
-                    System.out.println("Metadata for File: " + file.getName());
+                if (metadata) {
+                    try {
+                        IIOMetadata imageMetadata = reader.getImageMetadata(0);
+                        System.out.println("Metadata for File: " + file.getName());

-                    if (imageMetadata.getNativeMetadataFormatName() != null) {
-                        System.out.println("Native:");
-                        new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(imageMetadata.getAsTree(imageMetadata.getNativeMetadataFormatName()), false);
+                        if (imageMetadata.getNativeMetadataFormatName() != null) {
+                            System.out.println("Native:");
+                            new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(imageMetadata.getAsTree(imageMetadata.getNativeMetadataFormatName()), false);
+                        }
+                        if (imageMetadata.isStandardMetadataFormatSupported()) {
+                            System.out.println("Standard:");
+                            new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(imageMetadata.getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName), false);
+                        }
+
+                        System.out.println();
                    }
-                    if (imageMetadata.isStandardMetadataFormatSupported()) {
-                        System.out.println("Standard:");
-                        new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(imageMetadata.getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName), false);
-                    }
-
-                    System.out.println();
-
-                    int numThumbnails = reader.getNumThumbnails(0);
-                    for (int i = 0; i < numThumbnails; i++) {
-                        BufferedImage thumbnail = reader.readThumbnail(0, i);
-//                        System.err.println("thumbnail: " + thumbnail);
-                        showIt(thumbnail, String.format("Thumbnail: %s [%d x %d]", file.getName(), thumbnail.getWidth(), thumbnail.getHeight()));
+                    catch (IIOException e) {
+                        System.err.println("Could not read thumbnails: " + arg + ": " + e.getMessage());
+                        e.printStackTrace();
                    }
                }
-                catch (IIOException e) {
-                    System.err.println("Could not read thumbnails: " + arg + ": " + e.getMessage());
-                    e.printStackTrace();
+
+                if (thumbnails) {
+                    try {
+                        int numThumbnails = reader.getNumThumbnails(0);
+                        for (int i = 0; i < numThumbnails; i++) {
+                            BufferedImage thumbnail = reader.readThumbnail(0, i);
+                            //                        System.err.println("thumbnail: " + thumbnail);
+                            showIt(thumbnail, String.format("Thumbnail: %s [%d x %d]", file.getName(), thumbnail.getWidth(), thumbnail.getHeight()));
+                        }
+                    }
+                    catch (IIOException e) {
+                        System.err.println("Could not read thumbnails: " + arg + ": " + e.getMessage());
+                        e.printStackTrace();
+                    }
                }
            }
            catch (Throwable t) {
@@ -29,6 +29,7 @@
 package com.twelvemonkeys.imageio.plugins.jpeg;

 import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
 import com.twelvemonkeys.imageio.util.IIOUtil;
 import com.twelvemonkeys.lang.Validate;

@@ -48,14 +49,14 @@ import java.util.Locale;
 * @version $Id: JPEGImageReaderSpi.java,v 1.0 24.01.11 22.12 haraldk Exp$
 */
 public class JPEGImageReaderSpi extends ImageReaderSpiBase {
-    private ImageReaderSpi delegateProvider;
+    protected ImageReaderSpi delegateProvider;

    /**
     * Constructor for use by {@link javax.imageio.spi.IIORegistry} only.
     * The instance created will not work without being properly registered.
     */
    public JPEGImageReaderSpi() {
-        super(new JPEGProviderInfo());
+        this(new JPEGProviderInfo());
    }

    /**
@@ -69,6 +70,15 @@ public class JPEGImageReaderSpi extends ImageReaderSpiBase {
        this.delegateProvider = Validate.notNull(delegateProvider);
    }

+    /**
+     * Constructor for subclasses.
+     *
+     * @param info
+     */
+    protected JPEGImageReaderSpi(final ReaderWriterProviderInfo info) {
+        super(info);
+    }
+
    static ImageReaderSpi lookupDelegateProvider(final ServiceRegistry registry) {
        Iterator<ImageReaderSpi> providers = registry.getServiceProviders(ImageReaderSpi.class, true);

@@ -83,7 +93,7 @@ public class JPEGImageReaderSpi extends ImageReaderSpiBase {
        return null;
    }

-    @SuppressWarnings({"unchecked"})
+    @SuppressWarnings({"unchecked", "deprecation"})
    @Override
    public void onRegistration(final ServiceRegistry registry, final Class<?> category) {
        if (delegateProvider == null) {
@@ -63,8 +63,7 @@ import static org.junit.Assume.assumeNoException;
 import static org.junit.Assume.assumeNotNull;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;

 /**
 * JPEGImageReaderTest
@@ -75,9 +74,9 @@ import static org.mockito.Mockito.verify;
 */
 public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader> {

-    private static final JPEGImageReaderSpi SPI = new JPEGImageReaderSpi(lookupDelegateProvider());
+    protected static final JPEGImageReaderSpi SPI = new JPEGImageReaderSpi(lookupDelegateProvider());

-    private static ImageReaderSpi lookupDelegateProvider() {
+    protected static ImageReaderSpi lookupDelegateProvider() {
        return JPEGImageReaderSpi.lookupDelegateProvider(IIORegistry.getDefaultInstance());
    }

@@ -87,6 +86,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
        return Arrays.asList(
                new TestData(getClassLoaderResource("/jpeg/cmm-exception-adobe-rgb.jpg"), new Dimension(626, 76)),
                new TestData(getClassLoaderResource("/jpeg/cmm-exception-srgb.jpg"), new Dimension(1800, 1200)),
+                new TestData(getClassLoaderResource("/jpeg/corrupted-icc-srgb.jpg"), new Dimension(1024, 685)),
                new TestData(getClassLoaderResource("/jpeg/gray-sample.jpg"), new Dimension(386, 396)),
                new TestData(getClassLoaderResource("/jpeg/cmyk-sample.jpg"), new Dimension(160, 227)),
                new TestData(getClassLoaderResource("/jpeg/cmyk-sample-multiple-chunk-icc.jpg"), new Dimension(2707, 3804)),
@@ -370,7 +370,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
        assertEquals(1772, image.getWidth());
        assertEquals(8, image.getHeight());

-        verify(warningListener).warningOccurred(eq(reader), anyString());
+        verify(warningListener, atLeast(1)).warningOccurred(eq(reader), anyString());
    }

    @Test
@@ -1491,4 +1491,40 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
            reader.dispose();
        }
    }
+
+    @Test
+    public void testGetRawImageTypeAdobeAPP14CMYKAnd3channelData() throws IOException {
+        JPEGImageReader reader = createReader();
+
+        try {
+            reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/exif-jfif-app13-app14ycck-3channel.jpg")));
+
+            ImageTypeSpecifier rawType = reader.getRawImageType(0);
+            assertNull(rawType); // But no exception, please...
+        }
+        finally {
+            reader.dispose();
+        }
+    }
+
+    @Test
+    public void testReadAdobeAPP14CMYKAnd3channelData() throws IOException {
+        JPEGImageReader reader = createReader();
+
+        try {
+            reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/exif-jfif-app13-app14ycck-3channel.jpg")));
+
+            assertEquals(310, reader.getWidth(0));
+            assertEquals(384, reader.getHeight(0));
+
+            BufferedImage image = reader.read(0, null);
+            assertNotNull(image);
+            assertEquals(310, image.getWidth());
+            assertEquals(384, image.getHeight());
+            assertEquals(ColorSpace.TYPE_RGB, image.getColorModel().getColorSpace().getType());
+        }
+        finally {
+            reader.dispose();
+        }
+    }
 }
@@ -3,7 +3,7 @@
    <parent>
 	<groupId>com.twelvemonkeys.imageio</groupId>        
 	<artifactId>imageio</artifactId>        
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>imageio-metadata</artifactId>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -64,4 +64,8 @@ public interface Entry {

    // For arrays only
    int valueCount();
+
+    // TODO: getValueAsInt, UnsignedInt, Short, UnsignedShort, Byte, UnsignedByte etc
+    // TODO: getValueAsIntArray, ShortArray, ByteArray, StringArray etc (also for non-arrays, to return a single element array)
+
 }
@@ -0,0 +1,15 @@
+package com.twelvemonkeys.imageio.metadata;
+
+import javax.imageio.stream.ImageOutputStream;
+import java.io.IOException;
+
+/**
+ * MetadataWriter.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: MetadataWriter.java,v 1.0 28/05/15 harald.kuhr Exp$
+ */
+public abstract class MetadataWriter {
+    abstract public boolean write(Directory directory, ImageOutputStream stream) throws IOException;
+}
@@ -38,13 +38,14 @@ import com.twelvemonkeys.imageio.metadata.AbstractEntry;
 * @version $Id: EXIFEntry.java,v 1.0 Nov 13, 2009 5:47:35 PM haraldk Exp$
 */
 final class EXIFEntry extends AbstractEntry {
+    // TODO: Expose as TIFFEntry
    final private short type;

    EXIFEntry(final int identifier, final Object value, final short type) {
        super(identifier, value);

-        if (type < 1 || type > TIFF.TYPE_NAMES.length) {
-            throw new IllegalArgumentException(String.format("Illegal EXIF type: %s", type));
+        if (type < 1 || type >= TIFF.TYPE_NAMES.length) {
+            throw new IllegalArgumentException(String.format("Illegal TIFF type: %s", type));
        }

        // TODO: Validate that type is applicable to value?
@@ -71,6 +72,8 @@ final class EXIFEntry extends AbstractEntry {
                return "IPTC";
            case TIFF.TAG_PHOTOSHOP:
                return "Adobe";
+            case TIFF.TAG_PHOTOSHOP_IMAGE_SOURCE_DATA:
+                return "ImageSourceData";
            case TIFF.TAG_ICC_PROFILE:
                return "ICCProfile";

@@ -84,8 +87,16 @@ final class EXIFEntry extends AbstractEntry {
                return "Compression";
            case TIFF.TAG_PHOTOMETRIC_INTERPRETATION:
                return "PhotometricInterpretation";
+            case TIFF.TAG_FILL_ORDER:
+                return "FillOrder";
+            case TIFF.TAG_DOCUMENT_NAME:
+                return "DocumentName";
            case TIFF.TAG_IMAGE_DESCRIPTION:
                return "ImageDescription";
+            case TIFF.TAG_MAKE:
+                return "Make";
+            case TIFF.TAG_MODEL:
+                return "Model";
            case TIFF.TAG_STRIP_OFFSETS:
                return "StripOffsets";
            case TIFF.TAG_ORIENTATION:
@@ -104,14 +115,10 @@ final class EXIFEntry extends AbstractEntry {
                return "PlanarConfiguration";
            case TIFF.TAG_RESOLUTION_UNIT:
                return "ResolutionUnit";
-            case TIFF.TAG_JPEG_INTERCHANGE_FORMAT:
-                return "JPEGInterchangeFormat";
-            case TIFF.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH:
-                return "JPEGInterchangeFormatLength";
-            case TIFF.TAG_MAKE:
-                return "Make";
-            case TIFF.TAG_MODEL:
-                return "Model";
+            case TIFF.TAG_PAGE_NAME:
+                return "PageName";
+            case TIFF.TAG_PAGE_NUMBER:
+                return "PageNumber";
            case TIFF.TAG_SOFTWARE:
                return "Software";
            case TIFF.TAG_DATE_TIME:
@@ -138,10 +145,20 @@ final class EXIFEntry extends AbstractEntry {
                return "YCbCrPositioning";
            case TIFF.TAG_COLOR_MAP:
                return "ColorMap";
+            case TIFF.TAG_INK_SET:
+                return "InkSet";
+            case TIFF.TAG_INK_NAMES:
+                return "InkNames";
            case TIFF.TAG_EXTRA_SAMPLES:
                return "ExtraSamples";
            case TIFF.TAG_SAMPLE_FORMAT:
                return "SampleFormat";
+            case TIFF.TAG_JPEG_TABLES:
+                return "JPEGTables";
+            case TIFF.TAG_JPEG_INTERCHANGE_FORMAT:
+                return "JPEGInterchangeFormat";
+            case TIFF.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH:
+                return "JPEGInterchangeFormatLength";

            case TIFF.TAG_SUB_IFD:
                return "SubIFD";
@@ -176,6 +193,8 @@ final class EXIFEntry extends AbstractEntry {
                return "Flash";
            case EXIF.TAG_FOCAL_LENGTH:
                return "FocalLength";
+            case EXIF.TAG_SENSING_METHOD:
+                return "SensingMethod";
            case EXIF.TAG_FILE_SOURCE:
                return "FileSource";
            case EXIF.TAG_SCENE_TYPE:
@@ -189,7 +208,7 @@ final class EXIFEntry extends AbstractEntry {
            case EXIF.TAG_WHITE_BALANCE:
                return "WhiteBalance";
            case EXIF.TAG_DIGITAL_ZOOM_RATIO:
-                return "DigitalZoomRation";
+                return "DigitalZoomRatio";
            case EXIF.TAG_FOCAL_LENGTH_IN_35_MM_FILM:
                return "FocalLengthIn35mmFilm";
            case EXIF.TAG_SCENE_CAPTURE_TYPE:
@@ -202,6 +221,8 @@ final class EXIFEntry extends AbstractEntry {
                return "Saturation";
            case EXIF.TAG_SHARPNESS:
                return "Sharpness";
+            case EXIF.TAG_IMAGE_UNIQUE_ID:
+                return "ImageUniqueID";

            case EXIF.TAG_FLASHPIX_VERSION:
                return "FlashpixVersion";
@@ -214,6 +235,8 @@ final class EXIFEntry extends AbstractEntry {
                return "DateTimeDigitized";
            case EXIF.TAG_IMAGE_NUMBER:
                return "ImageNumber";
+            case EXIF.TAG_MAKER_NOTE:
+                return "MakerNote";
            case EXIF.TAG_USER_COMMENT:
                return "UserComment";

@@ -259,6 +282,6 @@ final class EXIFEntry extends AbstractEntry {

    @Override
    public String getTypeName() {
-        return TIFF.TYPE_NAMES[type - 1];
+        return TIFF.TYPE_NAMES[type];
    }
 }
@@ -89,8 +89,8 @@ public final class EXIFReader extends MetadataReader {

    // TODO: Consider re-writing so that the linked IFD parsing is done externally to the method
    protected Directory readDirectory(final ImageInputStream pInput, final long pOffset, final boolean readLinked) throws IOException {
-        List<IFD> ifds = new ArrayList<IFD>();
-        List<Entry> entries = new ArrayList<Entry>();
+        List<IFD> ifds = new ArrayList<>();
+        List<Entry> entries = new ArrayList<>();

        pInput.seek(pOffset);
        long nextOffset = -1;
@@ -156,7 +156,7 @@ public final class EXIFReader extends MetadataReader {
                try {
                    if (KNOWN_IFDS.contains(tagId)) {
                        long[] pointerOffsets = getPointerOffsets(entry);
-                        List<IFD> subIFDs = new ArrayList<IFD>(pointerOffsets.length);
+                        List<IFD> subIFDs = new ArrayList<>(pointerOffsets.length);

                        for (long pointerOffset : pointerOffsets) {
                            CompoundDirectory subDirectory = (CompoundDirectory) readDirectory(input, pointerOffset, false);
@@ -177,8 +177,11 @@ public final class EXIFReader extends MetadataReader {
                    }
                }
                catch (IIOException e) {
-                    // TODO: Issue warning without crashing...?
-                    e.printStackTrace();
+                    if (DEBUG) {
+                        // TODO: Issue warning without crashing...?
+                        System.err.println("Error parsing sub-IFD: " + tagId);
+                        e.printStackTrace();
+                    }
                }
            }
        }
@@ -446,8 +449,8 @@ public final class EXIFReader extends MetadataReader {
    }

    static int getValueLength(final int pType, final int pCount) {
-        if (pType > 0 && pType <= TIFF.TYPE_LENGTHS.length) {
-            return TIFF.TYPE_LENGTHS[pType - 1] * pCount;
+        if (pType > 0 && pType < TIFF.TYPE_LENGTHS.length) {
+            return TIFF.TYPE_LENGTHS[pType] * pCount;
        }

        return -1;
@@ -31,6 +31,7 @@ package com.twelvemonkeys.imageio.metadata.exif;
 import com.twelvemonkeys.imageio.metadata.CompoundDirectory;
 import com.twelvemonkeys.imageio.metadata.Directory;
 import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.MetadataWriter;
 import com.twelvemonkeys.lang.Validate;

 import javax.imageio.IIOException;
@@ -39,6 +40,7 @@ import java.io.IOException;
 import java.lang.reflect.Array;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.*;

 /**
@@ -48,7 +50,7 @@ import java.util.*;
 * @author last modified by $Author: haraldk$
 * @version $Id: EXIFWriter.java,v 1.0 17.07.13 10:20 haraldk Exp$
 */
-public class EXIFWriter {
+public final class EXIFWriter extends MetadataWriter {

    static final int WORD_LENGTH = 2;
    static final int LONGWORD_LENGTH = 4;
@@ -58,6 +60,7 @@ public class EXIFWriter {
        return write(new IFD(entries), stream);
    }

+    @Override
    public boolean write(final Directory directory, final ImageOutputStream stream) throws IOException {
        Validate.notNull(directory);
        Validate.notNull(stream);
@@ -92,11 +95,11 @@ public class EXIFWriter {
        stream.writeShort(42);
    }

-    public long writeIFD(final Collection<Entry> entries, ImageOutputStream stream) throws IOException {
+    public long writeIFD(final Collection<Entry> entries, final ImageOutputStream stream) throws IOException {
        return writeIFD(new IFD(entries), stream, false);
    }

-    private long writeIFD(final Directory original, ImageOutputStream stream, boolean isSubIFD) throws IOException {
+    private long writeIFD(final Directory original, final ImageOutputStream stream, final boolean isSubIFD) throws IOException {
        // TIFF spec says tags should be in increasing order, enforce that when writing
        Directory ordered = ensureOrderedDirectory(original);

@@ -181,7 +184,7 @@ public class EXIFWriter {

    private Directory ensureOrderedDirectory(final Directory directory) {
        if (!isSorted(directory)) {
-            List<Entry> entries = new ArrayList<Entry>(directory.size());
+            List<Entry> entries = new ArrayList<>(directory.size());

            for (Entry entry : directory) {
                entries.add(entry);
@@ -215,7 +218,7 @@ public class EXIFWriter {
        return true;
    }

-    private long writeValue(Entry entry, long dataOffset, ImageOutputStream stream) throws IOException {
+    private long writeValue(final Entry entry, final long dataOffset, final ImageOutputStream stream) throws IOException {
        short type = getType(entry);
        int valueLength = EXIFReader.getValueLength(type, getCount(entry));

@@ -236,18 +239,22 @@ public class EXIFWriter {
        }
    }

-    private int getCount(Entry entry) {
+    private int getCount(final Entry entry) {
        Object value = entry.getValue();
        return value instanceof String ? ((String) value).getBytes(Charset.forName("UTF-8")).length + 1 : entry.valueCount();
    }

-    private void writeValueInline(Object value, short type, ImageOutputStream stream) throws IOException {
+    private void writeValueInline(final Object value, final short type, final ImageOutputStream stream) throws IOException {
        if (value.getClass().isArray()) {
            switch (type) {
+                case TIFF.TYPE_UNDEFINED:
                case TIFF.TYPE_BYTE:
+                case TIFF.TYPE_SBYTE:
                    stream.write((byte[]) value);
                    break;
+
                case TIFF.TYPE_SHORT:
+                case TIFF.TYPE_SSHORT:
                    short[] shorts;

                    if (value instanceof short[]) {
@@ -276,7 +283,9 @@ public class EXIFWriter {

                    stream.writeShorts(shorts, 0, shorts.length);
                    break;
+
                case TIFF.TYPE_LONG:
+                case TIFF.TYPE_SLONG:
                    int[] ints;

                    if (value instanceof int[]) {
@@ -291,21 +300,49 @@ public class EXIFWriter {
                        }
                    }
                    else {
-                        throw new IllegalArgumentException("Unsupported type for TIFF SHORT: " + value.getClass());
+                        throw new IllegalArgumentException("Unsupported type for TIFF LONG: " + value.getClass());
                    }

                    stream.writeInts(ints, 0, ints.length);
-
                    break;

                case TIFF.TYPE_RATIONAL:
+                case TIFF.TYPE_SRATIONAL:
                    Rational[] rationals = (Rational[]) value;
                    for (Rational rational : rationals) {
                        stream.writeInt((int) rational.numerator());
                        stream.writeInt((int) rational.denominator());
                    }

-                // TODO: More types
+                    break;
+
+                case TIFF.TYPE_FLOAT:
+                    float[] floats;
+
+                    if (value instanceof float[]) {
+                        floats = (float[]) value;
+                    }
+                    else {
+                        throw new IllegalArgumentException("Unsupported type for TIFF FLOAT: " + value.getClass());
+                    }
+
+                    stream.writeFloats(floats, 0, floats.length);
+
+                    break;
+
+                case TIFF.TYPE_DOUBLE:
+                    double[] doubles;
+
+                    if (value instanceof double[]) {
+                        doubles = (double[]) value;
+                    }
+                    else {
+                        throw new IllegalArgumentException("Unsupported type for TIFF FLOAT: " + value.getClass());
+                    }
+
+                    stream.writeDoubles(doubles, 0, doubles.length);
+
+                    break;

                default:
                    throw new IllegalArgumentException("Unsupported TIFF type: " + type);
@@ -317,25 +354,35 @@ public class EXIFWriter {
        else {
            switch (type) {
                case TIFF.TYPE_BYTE:
-                    stream.writeByte((Integer) value);
+                case TIFF.TYPE_SBYTE:
+                case TIFF.TYPE_UNDEFINED:
+                    stream.writeByte(((Number) value).intValue());
                    break;
                case TIFF.TYPE_ASCII:
-                    byte[] bytes = ((String) value).getBytes(Charset.forName("UTF-8"));
+                    byte[] bytes = ((String) value).getBytes(StandardCharsets.UTF_8);
                    stream.write(bytes);
                    stream.write(0);
                    break;
                case TIFF.TYPE_SHORT:
-                    stream.writeShort((Integer) value);
+                case TIFF.TYPE_SSHORT:
+                    stream.writeShort(((Number) value).intValue());
                    break;
                case TIFF.TYPE_LONG:
+                case TIFF.TYPE_SLONG:
                    stream.writeInt(((Number) value).intValue());
                    break;
                case TIFF.TYPE_RATIONAL:
+                case TIFF.TYPE_SRATIONAL:
                    Rational rational = (Rational) value;
                    stream.writeInt((int) rational.numerator());
                    stream.writeInt((int) rational.denominator());
                    break;
-                    // TODO: More types
+                case TIFF.TYPE_FLOAT:
+                    stream.writeFloat(((Number) value).floatValue());
+                    break;
+                case TIFF.TYPE_DOUBLE:
+                    stream.writeDouble(((Number) value).doubleValue());
+                    break;

                default:
                    throw new IllegalArgumentException("Unsupported TIFF type: " + type);
@@ -343,7 +390,7 @@ public class EXIFWriter {
        }
    }

-    private void writeValueAt(long dataOffset, Object value, short type, ImageOutputStream stream) throws IOException {
+    private void writeValueAt(final long dataOffset, final Object value, final short type, final ImageOutputStream stream) throws IOException {
        stream.writeInt(assertIntegerOffset(dataOffset));
        long position = stream.getStreamPosition();
        stream.seek(dataOffset);
@@ -351,12 +398,27 @@ public class EXIFWriter {
        stream.seek(position);
    }

-    private short getType(Entry entry) {
+    private short getType(final Entry entry) {
+        // TODO: What a MESS! Rewrite and expose EXIFEntry as TIFFEntry or so...
+
+        // For internal entries use type directly
        if (entry instanceof EXIFEntry) {
            EXIFEntry exifEntry = (EXIFEntry) entry;
            return exifEntry.getType();
        }

+        // For other entries, use name if it matches
+        String typeName = entry.getTypeName();
+
+        if (typeName != null) {
+            for (int i = 1; i < TIFF.TYPE_NAMES.length; i++) {
+                if (typeName.equals(TIFF.TYPE_NAMES[i])) {
+                    return (short) i;
+                }
+            }
+        }
+
+        // Otherwise, fall back to the native Java type
        Object value = Validate.notNull(entry.getValue());

        boolean array = value.getClass().isArray();
@@ -88,13 +88,16 @@ public interface TIFF {
    Should probably all map to Java long (and fail if high bit is set for the unsigned types???)
     */
    String[] TYPE_NAMES = {
+            null,
            "BYTE", "ASCII", "SHORT", "LONG", "RATIONAL",
            "SBYTE", "UNDEFINED", "SSHORT", "SLONG", "SRATIONAL", "FLOAT", "DOUBLE",
            "IFD",
            null, null,
            "LONG8", "SLONG8", "IFD8"
    };
+    /** Length of the corresponding type, in bytes. */
    int[] TYPE_LENGTHS = {
+            -1,
            1, 1, 2, 4, 8,
            1, 1, 2, 4, 8, 4, 8,
            4,
@@ -124,6 +127,8 @@ public interface TIFF {
    int TAG_YCBCR_POSITIONING = 531;
    int TAG_X_RESOLUTION = 282;
    int TAG_Y_RESOLUTION = 283;
+    int TAG_X_POSITION = 286;
+    int TAG_Y_POSITION = 287;
    int TAG_RESOLUTION_UNIT = 296;

    /// B. Tags relating to recording offset
@@ -131,9 +136,13 @@ public interface TIFF {
    int TAG_STRIP_OFFSETS = 273;
    int TAG_ROWS_PER_STRIP = 278;
    int TAG_STRIP_BYTE_COUNTS = 279;
+    int TAG_FREE_OFFSETS = 288; // "Not recommended for general interchange."
    // "Old-style" JPEG (still used as EXIF thumbnail)
    int TAG_JPEG_INTERCHANGE_FORMAT = 513;
    int TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = 514;
+    
+    int TAG_GROUP3OPTIONS = 292;
+    int TAG_GROUP4OPTIONS = 293;

    /// C. Tags relating to image data characteristics

@@ -153,9 +162,11 @@ public interface TIFF {
    /// D. Other tags

    int TAG_DATE_TIME = 306;
+    int TAG_DOCUMENT_NAME = 269;
    int TAG_IMAGE_DESCRIPTION = 270;
    int TAG_MAKE = 271;
    int TAG_MODEL = 272;
+    int TAG_PAGE_NAME = 285;
    int TAG_PAGE_NUMBER = 297;
    int TAG_SOFTWARE = 305;
    int TAG_ARTIST = 315;
@@ -184,6 +195,18 @@ public interface TIFF {
     */
    int TAG_PHOTOSHOP = 34377;

+    /**
+     * Photoshop layer and mask information (byte order follows TIFF container).
+     * Layer and mask information found in a typical layered Photoshop file.
+     * Starts with a character string of "Adobe Photoshop Document Data Block"
+     * (or "Adobe Photoshop Document Data V0002" for PSB)
+     * including the null termination character.
+     * @see com.twelvemonkeys.imageio.metadata.psd.PSD
+     */
+    int TAG_PHOTOSHOP_IMAGE_SOURCE_DATA = 37724;
+
+    int TAG_PHOTOSHOP_ANNOTATIONS = 50255;
+
    /**
     * ICC Color Profile.
     * @see java.awt.color.ICC_Profile
@@ -36,110 +36,115 @@ package com.twelvemonkeys.imageio.metadata.iptc;
 * @version $Id: IPTC.java,v 1.0 Nov 11, 2009 6:20:21 PM haraldk Exp$
 */
 public interface IPTC {
-    static final int ENVELOPE_RECORD = 1 << 8;
-    static final int APPLICATION_RECORD = 2 << 8;
+    int ENVELOPE_RECORD = 1 << 8;
+    int APPLICATION_RECORD = 2 << 8;

-    static final int TAG_CODED_CHARACTER_SET = ENVELOPE_RECORD | 90;
+    /** 1:05: Destination */
+    int TAG_DESTINATION = ENVELOPE_RECORD | 5;
+    /** 1:50: Product ID */
+    int TAG_PRODUCT_ID = ENVELOPE_RECORD | 50;
+    /** 1:90: Coded Character Set */
+    int TAG_CODED_CHARACTER_SET = ENVELOPE_RECORD | 90;

    /** 2:00 Record Version (mandatory) */
-    public static final int TAG_RECORD_VERSION = APPLICATION_RECORD;       // 0x0200
+    int TAG_RECORD_VERSION = APPLICATION_RECORD;       // 0x0200

    /** 2:03 Object Type Reference */
-    public static final int TAG_OBJECT_TYPE_REFERENCE = APPLICATION_RECORD | 3;
+    int TAG_OBJECT_TYPE_REFERENCE = APPLICATION_RECORD | 3;
    /** 2:04 Object Attribute Reference (repeatable) */
-    public static final int TAG_OBJECT_ATTRIBUTE_REFERENCE = APPLICATION_RECORD | 4;
+    int TAG_OBJECT_ATTRIBUTE_REFERENCE = APPLICATION_RECORD | 4;
    /** 2:05 Object Name */
-    public static final int TAG_OBJECT_NAME = APPLICATION_RECORD | 5;   // 0x0205
+    int TAG_OBJECT_NAME = APPLICATION_RECORD | 5;   // 0x0205
    /** 2:07 Edit Status */
-    public static final int TAG_EDIT_STATUS = APPLICATION_RECORD | 7;
+    int TAG_EDIT_STATUS = APPLICATION_RECORD | 7;
    /** 2:08 Editorial Update */
-    public static final int TAG_EDITORIAL_UPDATE = APPLICATION_RECORD | 8;
+    int TAG_EDITORIAL_UPDATE = APPLICATION_RECORD | 8;
    /** 2:10 Urgency */
-    public static final int TAG_URGENCY = APPLICATION_RECORD | 10;
+    int TAG_URGENCY = APPLICATION_RECORD | 10;
    /** 2:12 Subect Reference (repeatable) */
-    public static final int TAG_SUBJECT_REFERENCE = APPLICATION_RECORD | 12;
+    int TAG_SUBJECT_REFERENCE = APPLICATION_RECORD | 12;
    /** 2:15 Category */
-    public static final int TAG_CATEGORY = APPLICATION_RECORD | 15;  // 0x020f
+    int TAG_CATEGORY = APPLICATION_RECORD | 15;  // 0x020f
    /** 2:20 Supplemental Category (repeatable) */
-    public static final int TAG_SUPPLEMENTAL_CATEGORIES = APPLICATION_RECORD | 20;
+    int TAG_SUPPLEMENTAL_CATEGORIES = APPLICATION_RECORD | 20;
    /** 2:22 Fixture Identifier */
-    public static final int TAG_FIXTURE_IDENTIFIER = APPLICATION_RECORD | 22;
+    int TAG_FIXTURE_IDENTIFIER = APPLICATION_RECORD | 22;
    /** 2:25 Keywords (repeatable) */
-    public static final int TAG_KEYWORDS = APPLICATION_RECORD | 25;
+    int TAG_KEYWORDS = APPLICATION_RECORD | 25;
    /** 2:26 Content Locataion Code (repeatable) */
-    public static final int TAG_CONTENT_LOCATION_CODE = APPLICATION_RECORD | 26;
+    int TAG_CONTENT_LOCATION_CODE = APPLICATION_RECORD | 26;
    /** 2:27 Content Locataion Name (repeatable) */
-    public static final int TAG_CONTENT_LOCATION_NAME = APPLICATION_RECORD | 27;
+    int TAG_CONTENT_LOCATION_NAME = APPLICATION_RECORD | 27;
    /** 2:30 Release Date */
-    public static final int TAG_RELEASE_DATE = APPLICATION_RECORD | 30;
+    int TAG_RELEASE_DATE = APPLICATION_RECORD | 30;
    /** 2:35 Release Time */
-    public static final int TAG_RELEASE_TIME = APPLICATION_RECORD | 35;
+    int TAG_RELEASE_TIME = APPLICATION_RECORD | 35;
    /** 2:37 Expiration Date */
-    public static final int TAG_EXPIRATION_DATE = APPLICATION_RECORD | 37;
+    int TAG_EXPIRATION_DATE = APPLICATION_RECORD | 37;
    /** 2:38 Expiration Time */
-    public static final int TAG_EXPIRATION_TIME = APPLICATION_RECORD | 38;
+    int TAG_EXPIRATION_TIME = APPLICATION_RECORD | 38;
    /** 2:40 Special Instructions */
-    public static final int TAG_SPECIAL_INSTRUCTIONS = APPLICATION_RECORD | 40;  // 0x0228
+    int TAG_SPECIAL_INSTRUCTIONS = APPLICATION_RECORD | 40;  // 0x0228
    /** 2:42 Action Advised (1: Kill, 2: Replace, 3: Append, 4: Reference) */
-    public static final int TAG_ACTION_ADVICED = APPLICATION_RECORD | 42;
+    int TAG_ACTION_ADVICED = APPLICATION_RECORD | 42;
    /** 2:45 Reference Service (repeatable in triplets with 2:47 and 2:50) */
-    public static final int TAG_REFERENCE_SERVICE = APPLICATION_RECORD | 45;
+    int TAG_REFERENCE_SERVICE = APPLICATION_RECORD | 45;
    /** 2:47 Reference Date (mandatory if 2:45 present) */
-    public static final int TAG_REFERENCE_DATE = APPLICATION_RECORD | 47;
+    int TAG_REFERENCE_DATE = APPLICATION_RECORD | 47;
    /** 2:50 Reference Number (mandatory if 2:45 present) */
-    public static final int TAG_REFERENCE_NUMBER = APPLICATION_RECORD | 50;
+    int TAG_REFERENCE_NUMBER = APPLICATION_RECORD | 50;
    /** 2:55 Date Created */
-    public static final int TAG_DATE_CREATED = APPLICATION_RECORD | 55; // 0x0237
+    int TAG_DATE_CREATED = APPLICATION_RECORD | 55; // 0x0237
    /** 2:60 Time Created */
-    public static final int TAG_TIME_CREATED = APPLICATION_RECORD | 60;
+    int TAG_TIME_CREATED = APPLICATION_RECORD | 60;
    /** 2:62 Digital Creation Date */
-    public static final int TAG_DIGITAL_CREATION_DATE = APPLICATION_RECORD | 62;
+    int TAG_DIGITAL_CREATION_DATE = APPLICATION_RECORD | 62;
    /** 2:63 Digital Creation Date */
-    public static final int TAG_DIGITAL_CREATION_TIME = APPLICATION_RECORD | 63;
+    int TAG_DIGITAL_CREATION_TIME = APPLICATION_RECORD | 63;
    /** 2:65 Originating Program */
-    public static final int TAG_ORIGINATING_PROGRAM = APPLICATION_RECORD | 65;
+    int TAG_ORIGINATING_PROGRAM = APPLICATION_RECORD | 65;
    /** 2:70 Program Version (only valid if 2:65 present) */
-    public static final int TAG_PROGRAM_VERSION = APPLICATION_RECORD | 70;
+    int TAG_PROGRAM_VERSION = APPLICATION_RECORD | 70;
    /** 2:75 Object Cycle (a: morning, p: evening, b: both) */
-    public static final int TAG_OBJECT_CYCLE = APPLICATION_RECORD | 75;
+    int TAG_OBJECT_CYCLE = APPLICATION_RECORD | 75;
    /** 2:80 By-line (repeatable) */
-    public static final int TAG_BY_LINE = APPLICATION_RECORD | 80;  // 0x0250
+    int TAG_BY_LINE = APPLICATION_RECORD | 80;  // 0x0250
    /** 2:85 By-line Title (repeatable) */
-    public static final int TAG_BY_LINE_TITLE = APPLICATION_RECORD | 85;  // 0x0255
+    int TAG_BY_LINE_TITLE = APPLICATION_RECORD | 85;  // 0x0255
    /** 2:90 City */
-    public static final int TAG_CITY = APPLICATION_RECORD | 90;  // 0x025a
+    int TAG_CITY = APPLICATION_RECORD | 90;  // 0x025a
    /** 2:92 Sub-location */
-    public static final int TAG_SUB_LOCATION = APPLICATION_RECORD | 92;
+    int TAG_SUB_LOCATION = APPLICATION_RECORD | 92;
    /** 2:95 Province/State */
-    public static final int TAG_PROVINCE_OR_STATE = APPLICATION_RECORD | 95;  // 0x025f
+    int TAG_PROVINCE_OR_STATE = APPLICATION_RECORD | 95;  // 0x025f
    /** 2:100 Country/Primary Location Code */
-    public static final int TAG_COUNTRY_OR_PRIMARY_LOCATION_CODE = APPLICATION_RECORD | 100;
+    int TAG_COUNTRY_OR_PRIMARY_LOCATION_CODE = APPLICATION_RECORD | 100;
    /** 2:101 Country/Primary Location Name */
-    public static final int TAG_COUNTRY_OR_PRIMARY_LOCATION = APPLICATION_RECORD | 101; // 0x0265
+    int TAG_COUNTRY_OR_PRIMARY_LOCATION = APPLICATION_RECORD | 101; // 0x0265
    /** 2:103 Original Transmission Reference */
-    public static final int TAG_ORIGINAL_TRANSMISSION_REFERENCE = APPLICATION_RECORD | 103; // 0x0267
+    int TAG_ORIGINAL_TRANSMISSION_REFERENCE = APPLICATION_RECORD | 103; // 0x0267
    /** 2:105 Headline */
-    public static final int TAG_HEADLINE = APPLICATION_RECORD | 105; // 0x0269
+    int TAG_HEADLINE = APPLICATION_RECORD | 105; // 0x0269
    /** 2:110 Credit */
-    public static final int TAG_CREDIT = APPLICATION_RECORD | 110; // 0x026e
+    int TAG_CREDIT = APPLICATION_RECORD | 110; // 0x026e
    /** 2:115 Source */
-    public static final int TAG_SOURCE = APPLICATION_RECORD | 115; // 0x0273
+    int TAG_SOURCE = APPLICATION_RECORD | 115; // 0x0273
    /** 2:116 Copyright Notice */
-    public static final int TAG_COPYRIGHT_NOTICE = APPLICATION_RECORD | 116; // 0x0274
+    int TAG_COPYRIGHT_NOTICE = APPLICATION_RECORD | 116; // 0x0274
    /** 2:118 Contact */
-    public static final int TAG_CONTACT = APPLICATION_RECORD | 118;
+    int TAG_CONTACT = APPLICATION_RECORD | 118;
    /** 2:120 Catption/Abstract */
-    public static final int TAG_CAPTION = APPLICATION_RECORD | 120; // 0x0278
+    int TAG_CAPTION = APPLICATION_RECORD | 120; // 0x0278
    /** 2:122 Writer/Editor (repeatable) */
-    public static final int TAG_WRITER = APPLICATION_RECORD | 122; // 0x027a
+    int TAG_WRITER = APPLICATION_RECORD | 122; // 0x027a
    /** 2:125 Rasterized Caption (binary data) */
-    public static final int TAG_RASTERIZED_CATPTION = APPLICATION_RECORD | 125;
+    int TAG_RASTERIZED_CATPTION = APPLICATION_RECORD | 125;
    /** 2:130 Image Type */
-    public static final int TAG_IMAGE_TYPE = APPLICATION_RECORD | 130;
+    int TAG_IMAGE_TYPE = APPLICATION_RECORD | 130;
    /** 2:131 Image Orientation */
-    public static final int TAG_IMAGE_ORIENTATION = APPLICATION_RECORD | 131;
+    int TAG_IMAGE_ORIENTATION = APPLICATION_RECORD | 131;
    /** 2:135 Language Identifier */
-    public static final int TAG_LANGUAGE_IDENTIFIER = APPLICATION_RECORD | 135;
+    int TAG_LANGUAGE_IDENTIFIER = APPLICATION_RECORD | 135;

    // TODO: 2:150-2:154 Audio

@@ -150,9 +155,28 @@ public interface IPTC {
     *
     * @see <a href="http://www.jobminder.net/">JobMinder Homepage</a>
     */
-    static final int CUSTOM_TAG_JOBMINDER_ASSIGNMENT_DATA = APPLICATION_RECORD | 199;
+    int CUSTOM_TAG_JOBMINDER_ASSIGNMENT_DATA = APPLICATION_RECORD | 199;

    // TODO: Other custom fields in 155-200 range?

    // TODO: 2:200-2:202 Object Preview Data
+
+    final class Tags {
+        static boolean isArray(final short tagId) {
+            switch (tagId) {
+                case IPTC.TAG_DESTINATION:
+                case IPTC.TAG_PRODUCT_ID:
+                case IPTC.TAG_SUBJECT_REFERENCE:
+                case IPTC.TAG_SUPPLEMENTAL_CATEGORIES:
+                case IPTC.TAG_KEYWORDS:
+                case IPTC.TAG_CONTENT_LOCATION_CODE:
+                case IPTC.TAG_CONTENT_LOCATION_NAME:
+                case IPTC.TAG_BY_LINE:
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+    }
 }
@@ -42,6 +42,7 @@ import java.util.Collection;
 */
 final class IPTCDirectory extends AbstractDirectory {
    IPTCDirectory(final Collection<? extends Entry> entries) {
+        // TODO: Normalize multiple entries with same key to single entry w/array
        super(entries);
    }
 }
@@ -47,6 +47,30 @@ class IPTCEntry extends AbstractEntry {
        switch ((Integer) getIdentifier()) {
            case IPTC.TAG_RECORD_VERSION:
                return "RecordVersion";
+            case IPTC.TAG_KEYWORDS:
+                return "Keywords";
+            case IPTC.TAG_SPECIAL_INSTRUCTIONS:
+                return "Instructions";
+            case IPTC.TAG_DIGITAL_CREATION_DATE:
+                return "DigitalCreationDate";
+            case IPTC.TAG_DIGITAL_CREATION_TIME:
+                return "DigitalCreationTime";
+            case IPTC.TAG_DATE_CREATED:
+                return "DateCreated";
+            case IPTC.TAG_TIME_CREATED:
+                return "TimeCreated";
+            case IPTC.TAG_BY_LINE_TITLE:
+                return "ByLineTitle";
+            case IPTC.TAG_CITY:
+                return "City";
+            case IPTC.TAG_SUB_LOCATION:
+                return "SubLocation";
+            case IPTC.TAG_PROVINCE_OR_STATE:
+                return "StateProvince";
+            case IPTC.TAG_COUNTRY_OR_PRIMARY_LOCATION_CODE:
+                return "CountryCode";
+            case IPTC.TAG_COUNTRY_OR_PRIMARY_LOCATION:
+                return "Country";
            case IPTC.TAG_SOURCE:
                return "Source";
            case IPTC.TAG_CAPTION:
@@ -43,8 +43,9 @@ import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;

 /**
 * IPTCReader
@@ -60,61 +61,88 @@ public final class IPTCReader extends MetadataReader {

    private int encoding = ENCODING_UNSPECIFIED;

-
    @Override
    public Directory read(final ImageInputStream input) throws IOException {
        Validate.notNull(input, "input");

-        List<Entry> entries = new ArrayList<Entry>();
+        Map<Short, Entry> entries = new LinkedHashMap<>();

        // 0x1c identifies start of a tag
        while (input.read() == 0x1c) {
            short tagId = input.readShort();
            int tagByteCount = input.readUnsignedShort();
-            Entry entry = readEntry(input, tagId, tagByteCount);
+
+            boolean array = IPTC.Tags.isArray(tagId);
+            Entry entry = readEntry(input, tagId, tagByteCount, array, array ? entries.get(tagId) : null);

            if (entry != null) {
-                entries.add(entry);
+                entries.put(tagId, entry);
            }
        }

-        return new IPTCDirectory(entries);
+        return new IPTCDirectory(entries.values());
    }

-    private IPTCEntry readEntry(final ImageInputStream pInput, final short pTagId, final int pLength) throws IOException {
-        Object value = null;
+    private IPTCEntry mergeEntries(final short tagId, final Object newValue, final Entry oldEntry) {
+        Object[] oldValue = oldEntry != null ? (Object[]) oldEntry.getValue() : null;
+        Object[] value;
+
+        if (newValue instanceof String) {
+            if (oldValue == null) {
+                value = new String[] {(String) newValue};
+            }
+            else {
+                String[] array = (String[]) oldValue;
+                value = Arrays.copyOf(array, array.length + 1);
+                value[value.length - 1] = newValue;
+            }
+        }
+        else {
+            if (oldValue == null) {
+                value = new Object[] {newValue};
+            }
+            else {
+                value = Arrays.copyOf(oldValue, oldValue.length + 1);
+                value [value .length - 1] = newValue;
+            }
+        }
+
+        return new IPTCEntry(tagId, value);
+    }
+
+    private IPTCEntry readEntry(final ImageInputStream pInput, final short pTagId, final int pLength, final boolean array, final Entry oldEntry) throws IOException {
+        Object value;

        switch (pTagId) {
            case IPTC.TAG_CODED_CHARACTER_SET:
                // TODO: Mapping from ISO 646 to Java supported character sets?
-                // TODO: Move somewhere else?
                encoding = parseEncoding(pInput, pLength);
                return null;
            case IPTC.TAG_RECORD_VERSION:
+                // TODO: Assert length == 2?
                // A single unsigned short value
                value = pInput.readUnsignedShort();
                break;
            default:
-                // Skip non-Application fields, as they are typically not human readable
-                if ((pTagId & 0xff00) != IPTC.APPLICATION_RECORD) {
-                    pInput.skipBytes(pLength);
-                    return null;
+                // TODO: Create Tags.getType(tag), to allow for more flexible types
+                if ((pTagId & 0xff00) == IPTC.APPLICATION_RECORD) {
+                    // Treat Application records as Strings
+                    if (pLength < 1) {
+                        value = null;
+                    }
+                    else {
+                        value = parseString(pInput, pLength);
+                    }
+                }
+                else {
+                    // Non-Application fields, typically not human readable
+                    byte[] data = new byte[pLength];
+                    pInput.readFully(data);
+                    value = data;
                }
-
-                // fall through
        }

-        // If we don't have a value, treat it as a string
-        if (value == null) {
-            if (pLength < 1) {
-                value = null;
-            }
-            else {
-                value = parseString(pInput, pLength);
-            }
-        }
-
-        return new IPTCEntry(pTagId, value);
+        return array ? mergeEntries(pTagId, value, oldEntry) : new IPTCEntry(pTagId, value);
    }

    private int parseEncoding(final ImageInputStream pInput, int tagByteCount) throws IOException {
@@ -148,7 +176,7 @@ public final class IPTCReader extends MetadataReader {
            }

            // Fall back to use ISO-8859-1
-            // This will not fail, but may may create wrong fallback-characters
+            // This will not fail, but may create wrong fallback-characters
            return StringUtil.decode(data, 0, data.length, "ISO8859_1");
        }
    }
@@ -0,0 +1,69 @@
+package com.twelvemonkeys.imageio.metadata.iptc;
+
+import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.MetadataWriter;
+
+import javax.imageio.stream.ImageOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import static com.twelvemonkeys.lang.Validate.notNull;
+
+/**
+ * IPTCWriter.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: IPTCWriter.java,v 1.0 28/05/15 harald.kuhr Exp$
+ */
+public final class IPTCWriter extends MetadataWriter {
+    @Override
+    public boolean write(final Directory directory, final ImageOutputStream stream) throws IOException {
+        notNull(directory, "directory");
+        notNull(stream, "stream");
+
+        // TODO: Make sure we always write application record version (2.00)
+        // TODO: Write encoding UTF8?
+
+        for (Entry entry : directory) {
+            int tag = (Integer) entry.getIdentifier();
+            Object value = entry.getValue();
+
+            if (IPTC.Tags.isArray((short) tag)) {
+                Object[] values = (Object[]) value;
+
+                for (Object v : values) {
+                    stream.write(0x1c);
+                    stream.writeShort(tag);
+                    writeValue(stream, v);
+                }
+            }
+            else {
+                stream.write(0x1c);
+                stream.writeShort(tag);
+                writeValue(stream, value);
+            }
+        }
+
+        return false;
+    }
+
+    private void writeValue(final ImageOutputStream stream, final Object value) throws IOException {
+        if (value instanceof String) {
+            byte[] data = ((String) value).getBytes(StandardCharsets.UTF_8);
+            stream.writeShort(data.length);
+            stream.write(data);
+        }
+        else if (value instanceof byte[]) {
+            byte[] data = (byte[]) value;
+            stream.writeShort(data.length);
+            stream.write(data);
+        }
+        else if (value instanceof Integer) {
+            // TODO: Need to know types from tag
+            stream.writeShort(2);
+            stream.writeShort((Integer) value);
+        }
+    }
+}
@@ -66,7 +66,8 @@ class PSDEntry extends AbstractEntry {
                        field.setAccessible(true);

                        if (field.get(null).equals(getIdentifier())) {
-                            return StringUtil.lispToCamel(field.getName().substring(4).replace("_", "-").toLowerCase(), true);
+                            String fieldName = StringUtil.lispToCamel(field.getName().substring(4).replace("_", "-").toLowerCase(), true);
+                            return name != null ? fieldName + ": " + name : fieldName;
                        }
                    }
                }
@@ -59,7 +59,7 @@ public final class PSDReader extends MetadataReader {
    public Directory read(final ImageInputStream input) throws IOException {
        Validate.notNull(input, "input");

-        List<PSDEntry> entries = new ArrayList<PSDEntry>();
+        List<PSDEntry> entries = new ArrayList<>();

        while (true) {
            try {
@@ -71,6 +71,7 @@ public final class XMPReader extends MetadataReader {
            // TODO: Consider parsing using SAX?
            // TODO: Determine encoding and parse using a Reader...
            // TODO: Refactor scanner to return inputstream?
+            // TODO: Be smarter about ASCII-NULL termination/padding (the SAXParser aka Xerces DOMParser doesn't like it)...
            DocumentBuilder builder = factory.newDocumentBuilder();
            Document document = builder.parse(new InputSource(IIOUtil.createStreamAdapter(input)));

@@ -79,7 +79,7 @@ public abstract class MetadataReaderAbstractTest {
        assertNotNull(directory);
    }

-    protected final Matcher<Entry> hasValue(final Object value) {
+    protected static Matcher<Entry> hasValue(final Object value) {
        return new EntryHasValue(value);
    }

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2012, 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.metadata;
+
+import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
+import org.junit.Test;
+
+import javax.imageio.ImageIO;
+import javax.imageio.spi.IIORegistry;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.MemoryCacheImageOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+
+/**
+ * ReaderAbstractTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: ReaderAbstractTest.java,v 1.0 04.01.12 09:40 haraldk Exp$
+ */
+public abstract class MetadataWriterAbstractTest {
+    static {
+        IIORegistry.getDefaultInstance().registerServiceProvider(new URLImageInputStreamSpi());
+        ImageIO.setUseCache(false);
+    }
+
+    protected final URL getResource(final String name) throws IOException {
+        return getClass().getResource(name);
+    }
+
+    protected final ImageInputStream getDataAsIIS() throws IOException {
+        return ImageIO.createImageInputStream(getData());
+    }
+
+    protected abstract InputStream getData() throws IOException;
+
+    protected abstract MetadataWriter createWriter();
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testWriteNullDirectory() throws IOException {
+        createWriter().write(null, new MemoryCacheImageOutputStream(new ByteArrayOutputStream()));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testWriteNullStream() throws IOException {
+        createWriter().write(new AbstractDirectory(new ArrayList<Entry>()) {
+        }, null);
+    }
+}
@@ -28,24 +28,17 @@

 package com.twelvemonkeys.imageio.metadata.exif;

-import com.twelvemonkeys.imageio.metadata.AbstractDirectory;
-import com.twelvemonkeys.imageio.metadata.AbstractEntry;
-import com.twelvemonkeys.imageio.metadata.Directory;
-import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.*;
 import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
-import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
 import com.twelvemonkeys.io.FastByteArrayOutputStream;
 import org.junit.Test;

 import javax.imageio.ImageIO;
-import javax.imageio.spi.IIORegistry;
-import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
 import javax.imageio.stream.ImageOutputStreamImpl;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -61,37 +54,25 @@ import static org.junit.Assert.assertNotNull;
 * @author last modified by $Author: haraldk$
 * @version $Id: EXIFWriterTest.java,v 1.0 18.07.13 09:53 haraldk Exp$
 */
-public class EXIFWriterTest {
-    static {
-        IIORegistry.getDefaultInstance().registerServiceProvider(new URLImageInputStreamSpi());
-        ImageIO.setUseCache(false);
-    }
+public class EXIFWriterTest extends MetadataWriterAbstractTest {

-    protected final URL getResource(final String name) throws IOException {
-        return getClass().getResource(name);
-    }
-
-    protected final ImageInputStream getDataAsIIS() throws IOException {
-        return ImageIO.createImageInputStream(getData());
-    }
-
-    //    @Override
+    @Override
    protected InputStream getData() throws IOException {
        return getResource("/exif/exif-jpeg-segment.bin").openStream();
    }

-//    @Override
    protected EXIFReader createReader() {
        return new EXIFReader();
    }

+    @Override
    protected EXIFWriter createWriter() {
        return new EXIFWriter();
    }

    @Test
    public void testWriteReadSimple() throws IOException {
-        ArrayList<Entry> entries = new ArrayList<Entry>();
+        ArrayList<Entry> entries = new ArrayList<>();
        entries.add(new EXIFEntry(TIFF.TAG_ORIENTATION, 1, TIFF.TYPE_SHORT));
        entries.add(new EXIFEntry(TIFF.TAG_IMAGE_WIDTH, 1600, TIFF.TYPE_SHORT));
        entries.add(new AbstractEntry(TIFF.TAG_IMAGE_HEIGHT, 900) {});
@@ -139,7 +120,7 @@ public class EXIFWriterTest {

    @Test
    public void testWriteMotorola() throws IOException {
-        ArrayList<Entry> entries = new ArrayList<Entry>();
+        ArrayList<Entry> entries = new ArrayList<>();
        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
        entries.add(new EXIFEntry(TIFF.TAG_IMAGE_WIDTH, Integer.MAX_VALUE, TIFF.TYPE_LONG));
        Directory directory = new AbstractDirectory(entries) {};
@@ -174,7 +155,7 @@ public class EXIFWriterTest {

    @Test
    public void testWriteIntel() throws IOException {
-        ArrayList<Entry> entries = new ArrayList<Entry>();
+        ArrayList<Entry> entries = new ArrayList<>();
        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
        entries.add(new EXIFEntry(TIFF.TAG_IMAGE_WIDTH, Integer.MAX_VALUE, TIFF.TYPE_LONG));
        Directory directory = new AbstractDirectory(entries) {};
@@ -254,7 +235,7 @@ public class EXIFWriterTest {

    @Test
    public void testComputeIFDSize() throws IOException {
-        ArrayList<Entry> entries = new ArrayList<Entry>();
+        ArrayList<Entry> entries = new ArrayList<>();
        entries.add(new EXIFEntry(TIFF.TAG_ORIENTATION, 1, TIFF.TYPE_SHORT));
        entries.add(new EXIFEntry(TIFF.TAG_IMAGE_WIDTH, 1600, TIFF.TYPE_SHORT));
        entries.add(new AbstractEntry(TIFF.TAG_IMAGE_HEIGHT, 900) {});
@@ -0,0 +1,71 @@
+package com.twelvemonkeys.imageio.metadata.iptc;
+
+import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.MetadataWriter;
+import com.twelvemonkeys.imageio.metadata.MetadataWriterAbstractTest;
+import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
+import org.junit.Test;
+
+import javax.imageio.stream.MemoryCacheImageOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeNotNull;
+
+/**
+ * IPTCWriterTest.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: IPTCWriterTest.java,v 1.0 05/06/15 harald.kuhr Exp$
+ */
+public class IPTCWriterTest extends MetadataWriterAbstractTest {
+    @Override
+    protected InputStream getData() throws IOException {
+        return getResource("/iptc/iptc-jpeg-segment.bin").openStream();
+    }
+
+    @Override
+    protected MetadataWriter createWriter() {
+        return new IPTCWriter();
+    }
+
+    private IPTCReader createReader() {
+        return new IPTCReader();
+    }
+
+    @Test
+    public void testRewriteExisting() throws IOException {
+        IPTCReader reader = createReader();
+        Directory iptc = reader.read(getDataAsIIS());
+        assumeNotNull(iptc);
+
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        MemoryCacheImageOutputStream stream = new MemoryCacheImageOutputStream(bytes);
+        createWriter().write(iptc, stream);
+        stream.close();
+
+        Directory written = reader.read(new ByteArrayImageInputStream(bytes.toByteArray()));
+        assertEquals(iptc, written);
+    }
+
+    @Test
+    public void testWrite() throws IOException {
+        List<IPTCEntry> entries = new ArrayList<>();
+        entries.add(new IPTCEntry(IPTC.TAG_KEYWORDS, new String[] {"Uno", "Due", "Tre"}));
+
+        Directory iptc = new IPTCDirectory(entries);
+
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        MemoryCacheImageOutputStream stream = new MemoryCacheImageOutputStream(bytes);
+        createWriter().write(iptc, stream);
+        stream.close();
+
+        Directory written = createReader().read(new ByteArrayImageInputStream(bytes.toByteArray()));
+        assertEquals(iptc, written);
+    }
+}
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-pcx</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PCX plugin</name>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -28,52 +28,22 @@

 package com.twelvemonkeys.imageio.plugins.pcx;

-import org.w3c.dom.Node;
+import com.twelvemonkeys.imageio.AbstractMetadata;

-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;
 import java.awt.image.IndexColorModel;

-final class PCXMetadata extends IIOMetadata {
-    // TODO: Clean up & extend AbstractMetadata (after moving from PSD -> Core)
-
+final class PCXMetadata extends AbstractMetadata {
    private final PCXHeader header;
    private final IndexColorModel vgaPalette;

    PCXMetadata(final PCXHeader header, final IndexColorModel vgaPalette) {
        this.header = header;
        this.vgaPalette = vgaPalette;
-
-        standardFormatSupported = true;
    }

-    @Override public boolean isReadOnly() {
-        return true;
-    }
-
-    @Override public Node getAsTree(final String formatName) {
-        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
-            return getStandardTree();
-        }
-        else {
-            throw new IllegalArgumentException("Unsupported metadata format: " + formatName);
-        }
-    }
-
-    @Override public void mergeTree(final String formatName, final Node root) {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    @Override public void reset() {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    @Override protected IIOMetadataNode getStandardChromaNode() {
+    @Override
+    protected IIOMetadataNode getStandardChromaNode() {
        IIOMetadataNode chroma = new IIOMetadataNode("Chroma");

        IndexColorModel palette = null;
@@ -141,7 +111,8 @@ final class PCXMetadata extends IIOMetadata {

    // No compression

-    @Override protected IIOMetadataNode getStandardCompressionNode() {
+    @Override
+    protected IIOMetadataNode getStandardCompressionNode() {
        if (header.getCompression() != PCX.COMPRESSION_NONE) {
            IIOMetadataNode node = new IIOMetadataNode("Compression");

@@ -159,7 +130,8 @@ final class PCXMetadata extends IIOMetadata {
        return null;
    }

-    @Override protected IIOMetadataNode getStandardDataNode() {
+    @Override
+    protected IIOMetadataNode getStandardDataNode() {
        IIOMetadataNode node = new IIOMetadataNode("Data");

        // Planar configuration only makes sense for multi-channel images
@@ -202,7 +174,8 @@ final class PCXMetadata extends IIOMetadata {
        return buffer.toString();
    }

-    @Override protected IIOMetadataNode getStandardDimensionNode() {
+    @Override
+    protected IIOMetadataNode getStandardDimensionNode() {
        IIOMetadataNode dimension = new IIOMetadataNode("Dimension");

        IIOMetadataNode imageOrientation = new IIOMetadataNode("ImageOrientation");
@@ -218,7 +191,8 @@ final class PCXMetadata extends IIOMetadata {

    // No tiling

-    @Override protected IIOMetadataNode getStandardTransparencyNode() {
+    @Override
+    protected IIOMetadataNode getStandardTransparencyNode() {
        // NOTE: There doesn't seem to be any god way to determine transparency, other than by convention
        // 1 channel: Gray, 2 channel: Gray + Alpha, 3 channel: RGB, 4 channel: RGBA (hopefully never CMYK...)

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-pdf</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PDF plugin</name>
@@ -21,7 +21,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-pict</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PICT plugin</name>
@@ -18,7 +18,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-pnm</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PNM plugin</name>
@@ -21,7 +21,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -28,51 +28,22 @@

 package com.twelvemonkeys.imageio.plugins.pnm;

-import org.w3c.dom.Node;
+import com.twelvemonkeys.imageio.AbstractMetadata;

-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;
 import java.awt.*;
 import java.awt.image.DataBuffer;
 import java.nio.ByteOrder;

-final class PNMMetadata extends IIOMetadata {
-    // TODO: Clean up & extend AbstractMetadata (after moving from PSD -> Core)
-
+final class PNMMetadata extends AbstractMetadata {
    private final PNMHeader header;

    PNMMetadata(final PNMHeader header) {
        this.header = header;
-        standardFormatSupported = true;
    }

-    @Override public boolean isReadOnly() {
-        return true;
-    }
-
-    @Override public Node getAsTree(final String formatName) {
-        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
-            return getStandardTree();
-        }
-        else {
-            throw new IllegalArgumentException("Unsupported metadata format: " + formatName);
-        }
-    }
-
-    @Override public void mergeTree(final String formatName, final Node root) {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    @Override public void reset() {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    @Override protected IIOMetadataNode getStandardChromaNode() {
+    @Override
+    protected IIOMetadataNode getStandardChromaNode() {
        IIOMetadataNode chroma = new IIOMetadataNode("Chroma");

        IIOMetadataNode csType = new IIOMetadataNode("ColorSpaceType");
@@ -105,7 +76,9 @@ final class PNMMetadata extends IIOMetadata {
        // TODO: Might make sense to set gamma?

        IIOMetadataNode blackIsZero = new IIOMetadataNode("BlackIsZero");
-        blackIsZero.setAttribute("value", header.getTupleType() == TupleType.BLACKANDWHITE_WHITE_IS_ZERO ? "FALSE" : "TRUE");
+        blackIsZero.setAttribute("value", header.getTupleType() == TupleType.BLACKANDWHITE_WHITE_IS_ZERO
+                                          ? "FALSE"
+                                          : "TRUE");
        chroma.appendChild(blackIsZero);

        return chroma;
@@ -113,11 +86,14 @@ final class PNMMetadata extends IIOMetadata {

    // No compression

-    @Override protected IIOMetadataNode getStandardDataNode() {
+    @Override
+    protected IIOMetadataNode getStandardDataNode() {
        IIOMetadataNode node = new IIOMetadataNode("Data");

        IIOMetadataNode sampleFormat = new IIOMetadataNode("SampleFormat");
-        sampleFormat.setAttribute("value", header.getTransferType() == DataBuffer.TYPE_FLOAT ? "Real" : "UnsignedIntegral");
+        sampleFormat.setAttribute("value", header.getTransferType() == DataBuffer.TYPE_FLOAT
+                                           ? "Real"
+                                           : "UnsignedIntegral");
        node.appendChild(sampleFormat);

        IIOMetadataNode bitsPerSample = new IIOMetadataNode("BitsPerSample");
@@ -128,7 +104,9 @@ final class PNMMetadata extends IIOMetadata {
        significantBitsPerSample.setAttribute("value", createListValue(header.getSamplesPerPixel(), Integer.toString(computeSignificantBits())));
        node.appendChild(significantBitsPerSample);

-        String msb = header.getByteOrder() == ByteOrder.BIG_ENDIAN ? "0" : Integer.toString(header.getBitsPerSample() - 1);
+        String msb = header.getByteOrder() == ByteOrder.BIG_ENDIAN
+                     ? "0"
+                     : Integer.toString(header.getBitsPerSample() - 1);
        IIOMetadataNode sampleMSB = new IIOMetadataNode("SampleMSB");
        sampleMSB.setAttribute("value", createListValue(header.getSamplesPerPixel(), msb));

@@ -166,7 +144,8 @@ final class PNMMetadata extends IIOMetadata {
        return buffer.toString();
    }

-    @Override protected IIOMetadataNode getStandardDimensionNode() {
+    @Override
+    protected IIOMetadataNode getStandardDimensionNode() {
        IIOMetadataNode dimension = new IIOMetadataNode("Dimension");

        IIOMetadataNode imageOrientation = new IIOMetadataNode("ImageOrientation");
@@ -178,7 +157,8 @@ final class PNMMetadata extends IIOMetadata {

    // No document node

-    @Override protected IIOMetadataNode getStandardTextNode() {
+    @Override
+    protected IIOMetadataNode getStandardTextNode() {
        if (!header.getComments().isEmpty()) {
            IIOMetadataNode text = new IIOMetadataNode("Text");

@@ -197,7 +177,8 @@ final class PNMMetadata extends IIOMetadata {

    // No tiling

-    @Override protected IIOMetadataNode getStandardTransparencyNode() {
+    @Override
+    protected IIOMetadataNode getStandardTransparencyNode() {
        IIOMetadataNode transparency = new IIOMetadataNode("Transparency");

        IIOMetadataNode alpha = new IIOMetadataNode("Alpha");
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-psd</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PSD plugin</name>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
@@ -578,6 +578,94 @@ interface PSD {
     */
    int RES_ALTERNATE_SPOT_COLORS = 0x042B;

+    /**
+     * (Photoshop CS2) Layer Selection ID(s).
+     * 2 bytes count, following is repeated for each count: 4 bytes layer ID.
+     */
+    int RES_LAYER_SELECTION_IDS = 0x042D;
+
+    /**
+     * (Photoshop CS2) HDR Toning information
+     */
+    int RES_HDR_TONING_INFO = 0x042E;
+
+    /**
+     * (Photoshop CS2) Print info
+     */
+    int RES_PRINT_INFO = 0x042F;
+
+    /**
+     * (Photoshop CS2) Layer Group(s) Enabled ID.
+     * 1 byte for each layer in the document, repeated by length of the resource.
+     * NOTE: Layer groups have start and end markers.
+     */
+    int RES_LAYER_GROUPS_ENABLED = 0x0430;
+
+    /**
+     * (Photoshop CS3) Color samplers resource.
+     * Also see ID 1038 for old format.
+     * See Color samplers resource format.
+     */
+    int RES_COLOR_SAMPLERS_RESOURCE = 0x0431;
+
+    /**
+     * (Photoshop CS3) Measurement Scale.
+     * 4 bytes (descriptor version = 16), Descriptor (see Descriptor structure)
+     */
+    int RES_MEASUREMENT_SCALE = 0x0432;
+
+    /**
+     * (Photoshop CS3) Timeline Information.
+     * 4 bytes (descriptor version = 16), Descriptor (see Descriptor structure)
+     */
+    int RES_TIMELINE_INFO = 0x0433;
+
+    /**
+     * (Photoshop CS3) Sheet Disclosure.
+     * 4 bytes (descriptor version = 16), Descriptor (see See Descriptor structure)
+     */
+    int RES_SHEET_DISCLOSURE = 0x0434;
+
+    /**
+     * (Photoshop CS3) DisplayInfo structure to support floating point colors.
+     * Also see ID 1007. See Appendix A in Photoshop API Guide.pdf .
+     */
+    int RES_DISPLAY_INFO_FP = 0x0435;
+
+    /**
+     * (Photoshop CS3) Onion Skins.
+     * 4 bytes (descriptor version = 16), Descriptor (see See Descriptor structure)
+     */
+    int RES_ONION_SKINS = 0x0436;
+
+    /**
+     * (Photoshop CS4) Count Information.
+     * 4 bytes (descriptor version = 16), Descriptor (see See Descriptor structure).
+     * Information about the count in the document. See the Count Tool.
+     */
+    int RES_COUNT_INFO = 0x0438;
+
+    /**
+     * (Photoshop CS5) Print Information.
+     * 4 bytes (descriptor version = 16), Descriptor (see See Descriptor structure).
+     * Information about the current print settings in the document. The color management options.
+     */
+    int RES_PRINT_INFO_CMM = 0x043A;
+
+    /**
+     * (Photoshop CS5) Print Style.
+     * 4 bytes (descriptor version = 16), Descriptor (see See Descriptor structure).
+     * Information about the current print style in the document. The printing marks, labels, ornaments, etc.
+     */
+    int RES_PRINT_STYLE = 0x043B;
+
+    /**
+     * (Photoshop CC) Path Selection State.
+     * 4 bytes (descriptor version = 16), Descriptor (see See Descriptor structure).
+     * Information about the current path selection state.
+     */
+    int RES_PATH_SELECTION_STATE = 0x0440;
+
    //    07d0-0bb6
    /* Saved path information */

@@ -28,8 +28,6 @@

 package com.twelvemonkeys.imageio.plugins.psd;

-import com.twelvemonkeys.image.InverseColorMapIndexColorModel;
-
 import javax.imageio.IIOException;
 import javax.imageio.stream.ImageInputStream;
 import java.awt.image.DataBuffer;
@@ -66,7 +64,7 @@ final class PSDColorData {
    IndexColorModel getIndexColorModel() {
        if (colorModel == null) {
            int[] rgb = toInterleavedRGB(colors);
-            colorModel = new InverseColorMapIndexColorModel(8, rgb.length, rgb, 0, false, -1, DataBuffer.TYPE_BYTE);
+            colorModel = new IndexColorModel(8, rgb.length, rgb, 0, false, -1, DataBuffer.TYPE_BYTE);
        }

        return colorModel;
@@ -54,11 +54,11 @@ import java.util.List;
 /**
 * ImageReader for Adobe Photoshop Document (PSD) format.
 *
- * @see <a href="http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/">Adobe Photoshop File Formats Specification<a>
- * @see <a href="http://www.fileformat.info/format/psd/egff.htm">Adobe Photoshop File Format Summary<a>
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @author last modified by $Author: haraldk$
 * @version $Id: PSDImageReader.java,v 1.0 Apr 29, 2008 4:45:52 PM haraldk Exp$
+ * @see <a href="http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/">Adobe Photoshop File Formats Specification<a>
+ * @see <a href="http://www.fileformat.info/format/psd/egff.htm">Adobe Photoshop File Format Summary<a>
 */
 // TODO: Implement ImageIO meta data interface
 // TODO: Figure out of we should assume Adobe RGB (1998) color model, if no embedded profile?
@@ -224,22 +224,22 @@ public final class PSDImageReader extends ImageReaderBase {
                    cs = ColorSpaces.getColorSpace(ColorSpaces.CS_GENERIC_CMYK);
                }

-                if (header.channels == 4 &&  header.bits == 8) {
+                if (header.channels == 4 && header.bits == 8) {
                    return ImageTypeSpecifiers.createBanded(cs, new int[] {0, 1, 2, 3}, new int[] {0, 0, 0, 0}, DataBuffer.TYPE_BYTE, false, false);
                }
-                else if (header.channels == 5 &&  header.bits == 8) {
+                else if (header.channels == 5 && header.bits == 8) {
                    return ImageTypeSpecifiers.createBanded(cs, new int[] {0, 1, 2, 3, 4}, new int[] {0, 0, 0, 0, 0}, DataBuffer.TYPE_BYTE, true, false);
                }
-                else if (header.channels == 4 &&  header.bits == 16) {
+                else if (header.channels == 4 && header.bits == 16) {
                    return ImageTypeSpecifiers.createBanded(cs, new int[] {0, 1, 2, 3}, new int[] {0, 0, 0, 0}, DataBuffer.TYPE_USHORT, false, false);
                }
-                else if (header.channels == 5 &&  header.bits == 16) {
+                else if (header.channels == 5 && header.bits == 16) {
                    return ImageTypeSpecifiers.createBanded(cs, new int[] {0, 1, 2, 3, 4}, new int[] {0, 0, 0, 0, 0}, DataBuffer.TYPE_USHORT, true, false);
                }
-                else if (header.channels == 4 &&  header.bits == 32) {
+                else if (header.channels == 4 && header.bits == 32) {
                    return ImageTypeSpecifiers.createBanded(cs, new int[] {0, 1, 2, 3}, new int[] {0, 0, 0, 0}, DataBuffer.TYPE_INT, false, false);
                }
-                else if (header.channels == 5 &&  header.bits == 32) {
+                else if (header.channels == 5 && header.bits == 32) {
                    return ImageTypeSpecifiers.createBanded(cs, new int[] {0, 1, 2, 3, 4}, new int[] {0, 0, 0, 0, 0}, DataBuffer.TYPE_INT, true, false);
                }

@@ -250,6 +250,7 @@ public final class PSDImageReader extends ImageReaderBase {
            case PSD.COLOR_MODE_LAB:
                // TODO: Implement
                // TODO: If there's a color profile embedded, it should be easy, otherwise we're out of luck...
+                // TODO: See the LAB color handling in TIFF
            default:
                throw new IIOException(String.format("Unsupported PSD MODE: %s (%d channels/%d bits)", header.mode, header.channels, header.bits));
        }
@@ -263,7 +264,7 @@ public final class PSDImageReader extends ImageReaderBase {
        ImageTypeSpecifier rawType = getRawImageTypeInternal(imageIndex);

        ColorSpace cs = rawType.getColorModel().getColorSpace();
-        List<ImageTypeSpecifier> types = new ArrayList<ImageTypeSpecifier>();
+        List<ImageTypeSpecifier> types = new ArrayList<>();

        switch (header.mode) {
            case PSD.COLOR_MODE_RGB:
@@ -308,7 +309,7 @@ public final class PSDImageReader extends ImageReaderBase {
                    types.add(ImageTypeSpecifiers.createInterleaved(cs, new int[] {4, 3, 2, 1, 0}, DataBuffer.TYPE_BYTE, true, false));
                }
                else if (rawType.getNumBands() == 4 && rawType.getBitsPerBand(0) == 16) {
-                    types.add(ImageTypeSpecifiers.createInterleaved(cs, new int[]{3, 2, 1, 0}, DataBuffer.TYPE_USHORT, false, false));
+                    types.add(ImageTypeSpecifiers.createInterleaved(cs, new int[] {3, 2, 1, 0}, DataBuffer.TYPE_USHORT, false, false));
                }
                else if (rawType.getNumBands() == 5 && rawType.getBitsPerBand(0) == 16) {
                    types.add(ImageTypeSpecifiers.createInterleaved(cs, new int[] {4, 3, 2, 1, 0}, DataBuffer.TYPE_USHORT, true, false));
@@ -362,25 +363,6 @@ public final class PSDImageReader extends ImageReaderBase {
        final Rectangle dest = new Rectangle();
        computeRegions(param, header.width, header.height, image, source, dest);

-        /*
-        NOTE: It seems safe to just leave this out for now. The only thing we need is to support sub sampling.
-        Sun's readers does not support arbitrary destination formats.
-
-        // TODO: Create temp raster in native format w * 1
-        // Read (sub-sampled) row into temp raster (skip other rows)
-        // Copy pixels from temp raster
-        // If possible, leave the destination image "untouched" (accelerated)
-        // See Jim Grahams comments:
-        // http://forums.java.net/jive/message.jspa?messageID=295758#295758
-
-        // TODO: Banding...
-
-        ImageTypeSpecifier spec = getRawImageType(imageIndex);
-        BufferedImage temp = spec.createBufferedImage(getWidth(imageIndex), 1);
-        temp.getRaster();
-
-        */
-
        final int xSub;
        final int ySub;

@@ -449,20 +431,19 @@ public final class PSDImageReader extends ImageReaderBase {
        return layersStart;
    }

-    private void readImageData(final BufferedImage pImage,
+    private void readImageData(final BufferedImage destination,
                               final ColorModel pSourceCM, final Rectangle pSource, final Rectangle pDest,
                               final int pXSub, final int pYSub,
                               final int[] pByteCounts, final int pCompression) throws IOException {

-        final WritableRaster raster = pImage.getRaster();
-        final ColorModel destCM = pImage.getColorModel();
+        WritableRaster destRaster = destination.getRaster();
+        ColorModel destCM = destination.getColorModel();

-        // TODO: This raster is 3-5 times longer than needed, depending on number of channels...
-        final WritableRaster rowRaster = pSourceCM.createCompatibleWritableRaster(header.width, 1);
-
-        final int channels = rowRaster.getNumBands();
-        final boolean banded = raster.getDataBuffer().getNumBanks() > 1;
-        final int interleavedBands = banded ? 1 : raster.getNumBands();
+        int channels = pSourceCM.createCompatibleSampleModel(1, 1).getNumBands();
+        ImageTypeSpecifier singleBandRowSpec = ImageTypeSpecifiers.createGrayscale(header.bits, pSourceCM.getTransferType());
+        WritableRaster rowRaster = singleBandRowSpec.createBufferedImage(header.width, 1).getRaster();
+        boolean banded = destRaster.getDataBuffer().getNumBanks() > 1;
+        int interleavedBands = banded ? 1 : destRaster.getNumBands();

        for (int c = 0; c < channels; c++) {
            int bandOffset = banded ? 0 : interleavedBands - 1 - c;
@@ -470,19 +451,19 @@ public final class PSDImageReader extends ImageReaderBase {
            switch (header.bits) {
                case 1:
                    byte[] row1 = ((DataBufferByte) rowRaster.getDataBuffer()).getData();
-                    read1bitChannel(c, header.channels, raster.getDataBuffer(), interleavedBands, bandOffset, pSourceCM, row1, pSource, pDest, pXSub, pYSub, header.width, header.height, pByteCounts, pCompression == PSD.COMPRESSION_RLE);
+                    read1bitChannel(c, header.channels, destRaster.getDataBuffer(), interleavedBands, bandOffset, pSourceCM, row1, pSource, pDest, pXSub, pYSub, header.width, header.height, pByteCounts, pCompression == PSD.COMPRESSION_RLE);
                    break;
                case 8:
                    byte[] row8 = ((DataBufferByte) rowRaster.getDataBuffer()).getData();
-                    read8bitChannel(c, header.channels, raster.getDataBuffer(), interleavedBands, bandOffset, pSourceCM, row8, pSource, pDest, pXSub, pYSub, header.width, header.height, pByteCounts, c * header.height, pCompression == PSD.COMPRESSION_RLE);
+                    read8bitChannel(c, header.channels, destRaster.getDataBuffer(), interleavedBands, bandOffset, pSourceCM, row8, pSource, pDest, pXSub, pYSub, header.width, header.height, pByteCounts, c * header.height, pCompression == PSD.COMPRESSION_RLE);
                    break;
                case 16:
                    short[] row16 = ((DataBufferUShort) rowRaster.getDataBuffer()).getData();
-                    read16bitChannel(c, header.channels, raster.getDataBuffer(), interleavedBands, bandOffset, pSourceCM, row16, pSource, pDest, pXSub, pYSub, header.width, header.height, pByteCounts, c * header.height, pCompression == PSD.COMPRESSION_RLE);
+                    read16bitChannel(c, header.channels, destRaster.getDataBuffer(), interleavedBands, bandOffset, pSourceCM, row16, pSource, pDest, pXSub, pYSub, header.width, header.height, pByteCounts, c * header.height, pCompression == PSD.COMPRESSION_RLE);
                    break;
                case 32:
                    int[] row32 = ((DataBufferInt) rowRaster.getDataBuffer()).getData();
-                    read32bitChannel(c, header.channels, raster.getDataBuffer(), interleavedBands, bandOffset, pSourceCM, row32, pSource, pDest, pXSub, pYSub, header.width, header.height, pByteCounts, c * header.height, pCompression == PSD.COMPRESSION_RLE);
+                    read32bitChannel(c, header.channels, destRaster.getDataBuffer(), interleavedBands, bandOffset, pSourceCM, row32, pSource, pDest, pXSub, pYSub, header.width, header.height, pByteCounts, c * header.height, pCompression == PSD.COMPRESSION_RLE);
                    break;
                default:
                    throw new IIOException(String.format("Unsupported PSD bit depth: %s", header.bits));
@@ -495,12 +476,12 @@ public final class PSDImageReader extends ImageReaderBase {

        if (header.bits == 8) {
            // Compose out the background of the semi-transparent pixels, as PS somehow has the background composed in
-            decomposeAlpha(destCM, raster.getDataBuffer(), pDest.width, pDest.height, raster.getNumBands());
+            decomposeAlpha(destCM, destRaster.getDataBuffer(), pDest.width, pDest.height, destRaster.getNumBands());
        }

        // NOTE: ColorSpace uses Object.equals(), so we rely on using same instances!
-        if (!pSourceCM.getColorSpace().equals(pImage.getColorModel().getColorSpace())) {
-            convertToDestinationCS(pSourceCM, pImage.getColorModel(), raster);
+        if (!pSourceCM.getColorSpace().equals(destination.getColorModel().getColorSpace())) {
+            convertToDestinationCS(pSourceCM, destination.getColorModel(), destRaster);
        }
    }

@@ -546,28 +527,24 @@ public final class PSDImageReader extends ImageReaderBase {
                                  final int[] pRowByteCounts, final int pRowOffset,
                                  final boolean pRLECompressed) throws IOException {

-        final boolean isCMYK = pSourceColorModel.getColorSpace().getType() == ColorSpace.TYPE_CMYK;
-        final int colorComponents = pSourceColorModel.getColorSpace().getNumComponents();
+        boolean isCMYK = pSourceColorModel.getColorSpace().getType() == ColorSpace.TYPE_CMYK;
+        int colorComponents = pSourceColorModel.getColorSpace().getNumComponents();
+        final boolean invert = isCMYK && pChannel < colorComponents;
        final boolean banded = pData.getNumBanks() > 1;

        for (int y = 0; y < pChannelHeight; y++) {
-            // NOTE: Length is in *16 bit values* (shorts)
-            int length = 2 * (pRLECompressed ? pRowByteCounts[pRowOffset + y] : pChannelWidth);
+            int length = (pRLECompressed ? pRowByteCounts[pRowOffset + y] : 4 * pChannelWidth);

            // TODO: Sometimes need to read the line y == source.y + source.height...
            // Read entire line, if within source region and sampling
            if (y >= pSource.y && y < pSource.y + pSource.height && y % pYSub == 0) {
                if (pRLECompressed) {
-                    DataInputStream input = PSDUtil.createPackBitsStream(imageInput, length);

-                    try {
+                    try (DataInputStream input = PSDUtil.createPackBitsStream(imageInput, length)) {
                        for (int x = 0; x < pChannelWidth; x++) {
                            pRow[x] = input.readInt();
                        }
                    }
-                    finally {
-                        input.close();
-                    }
                }
                else {
                    imageInput.readFully(pRow, 0, pChannelWidth);
@@ -580,7 +557,7 @@ public final class PSDImageReader extends ImageReaderBase {
                    int value = pRow[pSource.x + x * pXSub];

                    // CMYK values are stored inverted, but alpha is not
-                    if (isCMYK && pChannel < colorComponents) {
+                    if (invert) {
                        value = 0xffffffff - value;
                    }

@@ -609,27 +586,23 @@ public final class PSDImageReader extends ImageReaderBase {
                                  final int[] pRowByteCounts, final int pRowOffset,
                                  final boolean pRLECompressed) throws IOException {

-        final boolean isCMYK = pSourceColorModel.getColorSpace().getType() == ColorSpace.TYPE_CMYK;
-        final int colorComponents = pSourceColorModel.getColorSpace().getNumComponents();
+        boolean isCMYK = pSourceColorModel.getColorSpace().getType() == ColorSpace.TYPE_CMYK;
+        int colorComponents = pSourceColorModel.getColorSpace().getNumComponents();
+        final boolean invert = isCMYK && pChannel < colorComponents;
        final boolean banded = pData.getNumBanks() > 1;

        for (int y = 0; y < pChannelHeight; y++) {
-            // NOTE: Length is in *16 bit values* (shorts)
-            int length = 2 * (pRLECompressed ? pRowByteCounts[pRowOffset + y] : pChannelWidth);
+            int length = (pRLECompressed ? pRowByteCounts[pRowOffset + y] : 2 * pChannelWidth);

            // TODO: Sometimes need to read the line y == source.y + source.height...
            // Read entire line, if within source region and sampling
            if (y >= pSource.y && y < pSource.y + pSource.height && y % pYSub == 0) {
                if (pRLECompressed) {
-                    DataInputStream input = PSDUtil.createPackBitsStream(imageInput, length);
-                    try {
+                    try (DataInputStream input = PSDUtil.createPackBitsStream(imageInput, length)) {
                        for (int x = 0; x < pChannelWidth; x++) {
                            pRow[x] = input.readShort();
                        }
                    }
-                    finally {
-                        input.close();
-                    }
                }
                else {
                    imageInput.readFully(pRow, 0, pChannelWidth);
@@ -642,8 +615,8 @@ public final class PSDImageReader extends ImageReaderBase {
                    short value = pRow[pSource.x + x * pXSub];

                    // CMYK values are stored inverted, but alpha is not
-                    if (isCMYK && pChannel < colorComponents) {
-                        value = (short) (65535 - value & 0xffff);
+                    if (invert) {
+                        value = (short) (0xffff - value & 0xffff);
                    }

                    pData.setElem(banded ? pChannel : 0, offset + x * pBands, value);
@@ -671,8 +644,9 @@ public final class PSDImageReader extends ImageReaderBase {
                                 final int[] pRowByteCounts, final int pRowOffset,
                                 final boolean pRLECompressed) throws IOException {

-        final boolean isCMYK = pSourceColorModel.getColorSpace().getType() == ColorSpace.TYPE_CMYK;
-        final int colorComponents = pSourceColorModel.getColorSpace().getNumComponents();
+        boolean isCMYK = pSourceColorModel.getColorSpace().getType() == ColorSpace.TYPE_CMYK;
+        int colorComponents = pSourceColorModel.getColorSpace().getNumComponents();
+        final boolean invert = isCMYK && pChannel < colorComponents;
        final boolean banded = pData.getNumBanks() > 1;

        for (int y = 0; y < pChannelHeight; y++) {
@@ -682,13 +656,9 @@ public final class PSDImageReader extends ImageReaderBase {
            // Read entire line, if within source region and sampling
            if (y >= pSource.y && y < pSource.y + pSource.height && y % pYSub == 0) {
                if (pRLECompressed) {
-                    DataInputStream input = PSDUtil.createPackBitsStream(imageInput, length);
-                    try {
+                    try (DataInputStream input = PSDUtil.createPackBitsStream(imageInput, length)) {
                        input.readFully(pRow, 0, pChannelWidth);
                    }
-                    finally {
-                        input.close();
-                    }
                }
                else {
                    imageInput.readFully(pRow, 0, pChannelWidth);
@@ -701,8 +671,8 @@ public final class PSDImageReader extends ImageReaderBase {
                    byte value = pRow[pSource.x + x * pXSub];

                    // CMYK values are stored inverted, but alpha is not
-                    if (isCMYK && pChannel < colorComponents) {
-                        value = (byte) (255 - value & 0xff);
+                    if (invert) {
+                        value = (byte) (0xff - value & 0xff);
                    }

                    pData.setElem(banded ? pChannel : 0, offset + x * pBands, value);
@@ -741,13 +711,9 @@ public final class PSDImageReader extends ImageReaderBase {
            // Read entire line, if within source region and sampling
            if (y >= pSource.y && y < pSource.y + pSource.height && y % pYSub == 0) {
                if (pRLECompressed) {
-                    DataInputStream input = PSDUtil.createPackBitsStream(imageInput, length);
-                    try {
+                    try (DataInputStream input = PSDUtil.createPackBitsStream(imageInput, length)) {
                        input.readFully(pRow, 0, pRow.length);
                    }
-                    finally {
-                        input.close();
-                    }
                }
                else {
                    imageInput.readFully(pRow, 0, pRow.length);
@@ -868,8 +834,8 @@ public final class PSDImageReader extends ImageReaderBase {

            if (!header.hasValidDimensions()) {
                processWarningOccurred(String.format("Dimensions exceed maximum allowed for %s: %dx%d (max %dx%d)",
-                                                     header.largeFormat ? "PSB" : "PSD",
-                                                     header.width, header.height, header.getMaxSize(), header.getMaxSize()));
+                        header.largeFormat ? "PSB" : "PSD",
+                        header.width, header.height, header.getMaxSize(), header.getMaxSize()));
            }

            metadata = new PSDMetadata();
@@ -898,6 +864,10 @@ public final class PSDImageReader extends ImageReaderBase {

            // Don't need the header again
            imageInput.flushBefore(imageInput.getStreamPosition());
+
+            if (DEBUG) {
+                System.out.println("header: " + header);
+            }
        }
    }

@@ -913,7 +883,7 @@ public final class PSDImageReader extends ImageReaderBase {

            if (pParseData && imageResourcesLength > 0) {
                if (metadata.imageResources == null) {
-                    metadata.imageResources = new ArrayList<PSDImageResource>();
+                    metadata.imageResources = new ArrayList<>();
                    long expectedEnd = imageInput.getStreamPosition() + imageResourcesLength;

                    while (imageInput.getStreamPosition() < expectedEnd) {
@@ -921,6 +891,10 @@ public final class PSDImageReader extends ImageReaderBase {
                        metadata.imageResources.add(resource);
                    }

+                    if (DEBUG) {
+                        System.out.println("imageResources: " + metadata.imageResources);
+                    }
+
                    if (imageInput.getStreamPosition() != expectedEnd) {
                        throw new IIOException("Corrupt PSD document"); // ..or maybe just a bug in the reader.. ;-)
                    }
@@ -970,10 +944,13 @@ public final class PSDImageReader extends ImageReaderBase {

                        long read = imageInput.getStreamPosition() - pos;

-                        long diff = layerInfoLength - (read - (header.largeFormat ? 8 : 4)); // - 4 for the layerInfoLength field itself
+                        long diff = layerInfoLength - (read - (header.largeFormat
+                                                               ? 8
+                                                               : 4)); // - 4 for the layerInfoLength field itself

                        imageInput.skipBytes(diff);
-                    } else {
+                    }
+                    else {
                        metadata.layerInfo = Collections.emptyList();
                    }

@@ -990,6 +967,10 @@ public final class PSDImageReader extends ImageReaderBase {
                    // TODO: We should now be able to flush input
 //                    imageInput.seek(metadata.layerAndMaskInfoStart + layerAndMaskInfoLength + (header.largeFormat ? 8 : 4));
 //                    imageInput.flushBefore(metadata.layerAndMaskInfoStart + layerAndMaskInfoLength + (header.largeFormat ? 8 : 4));
+
+                    if (DEBUG) {
+                        System.out.println("layerInfo: " + metadata.layerInfo);
+                    }
                }
            }

@@ -1001,20 +982,18 @@ public final class PSDImageReader extends ImageReaderBase {
        final int width = getLayerWidth(layerIndex);
        final int height = getLayerHeight(layerIndex);

+        // TODO: This behaviour must be documented!
+        // If layer has no pixel data, return null
+        if (width <= 0 || height <= 0) {
+            return null;
+        }
+
        PSDLayerInfo layerInfo = metadata.layerInfo.get(layerIndex);
 //        final int width = layerInfo.right - layerInfo.left;
 //        final int height = layerInfo.bottom - layerInfo.top;

        // Even if raw/imageType has no alpha, the layers may still have alpha...
        ImageTypeSpecifier imageType = getRawImageTypeForLayer(layerIndex);
-
-        // TODO: Find a better way of handling layers of size 0
-        // - Return null? Return a BufferedImage subclass that has no data (0 x 0)?
-        // Create image (or dummy, if h/w are <= 0)
-//        BufferedImage layer = imageType.createBufferedImage(Math.max(1, width), Math.max(1, height));
-        if (width <= 0 || height <= 0) {
-            return null;
-        }
        BufferedImage layer = getDestination(param, getImageTypes(layerIndex + 1), Math.max(1, width), Math.max(1, height));

        imageInput.seek(findLayerStartPos(layerIndex));
@@ -1028,9 +1007,8 @@ public final class PSDImageReader extends ImageReaderBase {
        final WritableRaster raster = layer.getRaster();
        final ColorModel destCM = layer.getColorModel();

-        // TODO: This raster is 3-5 times longer than needed, depending on number of channels...
        ColorModel sourceCM = imageType.getColorModel();
-        final WritableRaster rowRaster = width > 0 ? sourceCM.createCompatibleWritableRaster(width, 1) : null;
+        final WritableRaster rowRaster = sourceCM.createCompatibleWritableRaster((int) Math.ceil(width / (double) sourceCM.getNumComponents()), 1);

        final boolean banded = raster.getDataBuffer().getNumBanks() > 1;
        final int interleavedBands = banded ? 1 : raster.getNumBands();
@@ -1134,7 +1112,6 @@ public final class PSDImageReader extends ImageReaderBase {
                }
            }

-
            // If there really is more channels, then create new imageTypeSpec
            if (newBandNum > compositeType.getNumBands()) {
                int[] indices = new int[newBandNum];
@@ -1228,7 +1205,7 @@ public final class PSDImageReader extends ImageReaderBase {
        for (PSDImageResource resource : metadata.imageResources) {
            if (resource instanceof PSDThumbnail) {
                if (thumbnails == null) {
-                    thumbnails = new ArrayList<PSDThumbnail>();
+                    thumbnails = new ArrayList<>();
                }

                thumbnails.add((PSDThumbnail) resource);
@@ -1386,7 +1363,7 @@ public final class PSDImageReader extends ImageReaderBase {
            System.out.println("read time: " + (System.currentTimeMillis() - start));
            System.out.println("image: " + image);

-            if (image.getColorModel().getColorSpace().getType() == ColorSpace.TYPE_CMYK) {
+            if (image.getType() == BufferedImage.TYPE_CUSTOM) {
                try {
                    ColorConvertOp op = new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_sRGB), null);
                    GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration();
@@ -1407,8 +1384,24 @@ public final class PSDImageReader extends ImageReaderBase {
                for (int i = 1; i < images; i++) {
                    start = System.currentTimeMillis();
                    BufferedImage layer = imageReader.read(i);
+
                    System.out.println("layer read time: " + (System.currentTimeMillis() - start));
                    System.err.println("layer: " + layer);
+
+                    if (layer != null && layer.getType() == BufferedImage.TYPE_CUSTOM) {
+                        try {
+                            ColorConvertOp op = new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_sRGB), null);
+                            GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration();
+                            layer = op.filter(layer, gc.createCompatibleImage(layer.getWidth(), layer.getHeight(), layer.getTransparency()));
+                        }
+                        catch (Exception e) {
+                            e.printStackTrace();
+                            layer = ImageUtil.accelerate(layer);
+                        }
+                        System.out.println("layer conversion time: " + (System.currentTimeMillis() - start));
+                        System.out.println("layer: " + layer);
+                    }
+
                    showIt(layer, "layer " + i);
                }
            }
@@ -74,7 +74,7 @@ final class PSDLayerInfo {
        long extraDataSize = pInput.readUnsignedInt();

        // Layer mask/adjustment layer data
-        int layerMaskDataSize = pInput.readInt(); // May be 0, 20 or 36 bytes...
+        int layerMaskDataSize = pInput.readInt(); // May be 0, 20 or variable (up to 55) bytes...
        if (layerMaskDataSize != 0) {
            layerMaskData = new PSDLayerMaskData(pInput, layerMaskDataSize);
        }
@@ -47,42 +47,90 @@ final class PSDLayerMaskData {
    private int defaultColor;
    private int flags;

-    private boolean large;
-    private int realFlags;
-    private int realUserBackground;
-    private int realTop;
-    private int realLeft;
-    private int realBottom;
-    private int realRight;
+    private int maskParams;
+    private int userMaskDensity;
+    private double userMaskFeather;
+    private int vectorMaskDensity;
+    private double vectorMaskFeather;

    PSDLayerMaskData(final ImageInputStream pInput, final int pSize) throws IOException {
-        if (pSize != 20 && pSize != 36) {
-            throw new IIOException("Illegal PSD Layer Mask data size: " + pSize + " (expected 20 or 36)");
+        if (pSize < 20 || pSize > 55) {
+            throw new IIOException("Illegal PSD Layer Mask data size: " + pSize + " (expected between 20 and 55)");
        }

+        // Rectangle enclosing layer mask: Top, left, bottom, right.
        top = pInput.readInt();
        left = pInput.readInt();
        bottom = pInput.readInt();
        right = pInput.readInt();

+        // Default color. 0 or 255
        defaultColor = pInput.readUnsignedByte();

+        // Flags.
+        // bit 0 = position relative to layer
+        // bit 1 = layer mask disabled
+        // bit 2 = invert layer mask when blending (Obsolete)
+        // bit 3 = indicates that the user mask actually came from rendering other data
+        // bit 4 = indicates that the user and/or vector masks have parameters applied to them
        flags = pInput.readUnsignedByte();

-        if (pSize == 20) {
+        int dataLeft = pSize - 18;
+
+        if ((flags & 0x10) != 0) {
+            // Mask Parameters. Only present if bit 4 of Flags set above.
+            maskParams = pInput.readUnsignedByte();
+            dataLeft--;
+
+            // Mask Parameters bit flags present as follows:
+            // bit 0 = user mask density, 1 byte
+            // bit 1 = user mask feather, 8 byte, double
+            // bit 2 = vector mask density, 1 byte
+            // bit 3 = vector mask feather, 8 bytes, double
+            if ((maskParams & 0x01) != 0) {
+                userMaskDensity = pInput.readByte();
+                dataLeft--;
+            }
+            if ((maskParams & 0x02) != 0) {
+                userMaskFeather = pInput.readDouble();
+                dataLeft -= 8;
+            }
+            if ((maskParams & 0x04) != 0) {
+                vectorMaskDensity = pInput.readByte();
+                dataLeft--;
+            }
+            if ((maskParams & 0x08) != 0) {
+                vectorMaskFeather = pInput.readDouble();
+                dataLeft -= 8;
+            }
+        }
+
+        // Padding. Only present if size = 20. Otherwise the following is present
+        if (pSize == 20 && dataLeft == 2) {
            pInput.readShort(); // Pad
+            dataLeft -= 2;
        }
        else {
-            // TODO: What to make out of this?
-            large = true;
+            if (dataLeft >= 2) {
+                // Real Flags. Same as Flags information above.
+                flags = pInput.readUnsignedByte();
+                dataLeft--;
+                // Real user mask background. 0 or 255.
+                defaultColor = pInput.readUnsignedByte();
+                dataLeft--;
+            }
+            if (dataLeft >= 16) {
+                // Rectangle enclosing layer mask: Top, left, bottom, right.
+                top = pInput.readInt();
+                left = pInput.readInt();
+                bottom = pInput.readInt();
+                right = pInput.readInt();
+                dataLeft -= 16;
+            }
+        }

-            realFlags = pInput.readUnsignedByte();
-            realUserBackground = pInput.readUnsignedByte();
-
-            realTop = pInput.readInt();
-            realLeft = pInput.readInt();
-            realBottom = pInput.readInt();
-            realRight = pInput.readInt();
+        if (dataLeft > 0) {
+            pInput.skipBytes(dataLeft);
        }
    }

@@ -97,40 +145,54 @@ final class PSDLayerMaskData {
        builder.append(", default color: ").append(defaultColor);
        builder.append(", flags: ").append(Integer.toBinaryString(flags));

-        // TODO: Maybe the flag bits have oposite order?
        builder.append(" (");
        if ((flags & 0x01) != 0) {
-            builder.append("Pos. rel. to layer");
+            builder.append("relative");
        }
        else {
-            builder.append("Pos. abs.");
+            builder.append("absolute");
        }
        if ((flags & 0x02) != 0) {
-            builder.append(", Mask disabled");
+            builder.append(", disabled");
        }
        else {
-            builder.append(", Mask enabled");
+            builder.append(", enabled");
        }
        if ((flags & 0x04) != 0) {
-            builder.append(", Invert mask");
+            builder.append(", inverted");
        }
        if ((flags & 0x08) != 0) {
-            builder.append(", Unknown bit 3");
+            builder.append(", from rendered data");
        }
        if ((flags & 0x10) != 0) {
-            builder.append(", Unknown bit 4");
+            builder.append(", has parameters");
        }
        if ((flags & 0x20) != 0) {
-            builder.append(", Unknown bit 5");
+            builder.append(", unknown flag (bit 5)");
        }
        if ((flags & 0x40) != 0) {
-            builder.append(", Unknown bit 6");
+            builder.append(", unknown flag (bit 6)");
        }
        if ((flags & 0x80) != 0) {
-            builder.append(", Unknown bit 7");
+            builder.append(", unknown flag (bit 7)");
        }
        builder.append(")");

+        if ((flags & 0x10) != 0) {
+            if ((maskParams & 0x01) != 0) {
+                builder.append(", userMaskDensity: ").append(userMaskDensity);
+            }
+            if ((maskParams & 0x02) != 0) {
+                builder.append(", userMaskFeather: ").append(userMaskFeather);
+            }
+            if ((maskParams & 0x04) != 0) {
+                builder.append(", vectorMaskDensity: ").append(vectorMaskDensity);
+            }
+            if ((maskParams & 0x08) != 0) {
+                builder.append(", vectorMaskFeather: ").append(vectorMaskFeather);
+            }
+        }
+
        builder.append("]");
        return builder.toString();
    }
@@ -28,6 +28,7 @@

 package com.twelvemonkeys.imageio.plugins.psd;

+import com.twelvemonkeys.imageio.AbstractMetadata;
 import com.twelvemonkeys.imageio.metadata.Directory;
 import com.twelvemonkeys.imageio.metadata.Entry;
 import com.twelvemonkeys.imageio.metadata.exif.TIFF;
@@ -571,9 +572,8 @@ public final class PSDMetadata extends AbstractMetadata {
        compressionNode.appendChild(compressionTypeName);

        if (compression != PSD.COMPRESSION_NONE) {
-            IIOMetadataNode lossless = new IIOMetadataNode("Lossless");
-            lossless.setAttribute("value", "true");
-            compressionNode.appendChild(lossless);
+            compressionNode.appendChild(new IIOMetadataNode("Lossless"));
+            // "value" defaults to TRUE, all PSD compressions are lossless
        }

        return compressionNode;
@@ -755,7 +755,7 @@ public final class PSDMetadata extends AbstractMetadata {
    }

    private void appendTextEntriesFlat(final IIOMetadataNode node, final Directory directory, final FilterIterator.Filter<Entry> filter) {
-        FilterIterator<Entry> entries = new FilterIterator<Entry>(directory.iterator(), filter);
+        FilterIterator<Entry> entries = new FilterIterator<>(directory.iterator(), filter);

        while (entries.hasNext()) {
            Entry entry = entries.next();
@@ -807,7 +807,7 @@ public final class PSDMetadata extends AbstractMetadata {
        @SuppressWarnings({"unchecked"})
        Iterator<T> iterator = (Iterator<T>) imageResources.iterator();

-        return new FilterIterator<T>(iterator, new FilterIterator.Filter<T>() {
+        return new FilterIterator<>(iterator, new FilterIterator.Filter<T>() {
            public boolean accept(final T pElement) {
                return resourceType.isInstance(pElement);
            }
@@ -817,7 +817,7 @@ public final class PSDMetadata extends AbstractMetadata {
    Iterator<PSDImageResource> getResources(final int... resourceTypes) {
        Iterator<PSDImageResource> iterator = imageResources.iterator();

-        return new FilterIterator<PSDImageResource>(iterator, new FilterIterator.Filter<PSDImageResource>() {
+        return new FilterIterator<>(iterator, new FilterIterator.Filter<PSDImageResource>() {
            public boolean accept(final PSDImageResource pResource) {
                for (int type : resourceTypes) {
                    if (type == pResource.id) {
@@ -51,7 +51,7 @@ final class PSDUtil {
    static String intToStr(int value) {
        return new String(
                new byte[]{
-                        (byte) ((value & 0xff000000) >> 24),
+                        (byte) ((value & 0xff000000) >>> 24),
                        (byte) ((value & 0x00ff0000) >> 16),
                        (byte) ((value & 0x0000ff00) >> 8),
                        (byte) ((value & 0x000000ff))
@@ -1,4 +1,3 @@
- Implement source subsampling and region of interest
 - Separate package for the resources (seems to be a lot)?
  - Move to metadata package, or implement metadata interface, as this is (similar|equivalent) to TIFF/JPEG APP13 segment tag?
 - Possibility to read only some resources? readResources(int[] resourceKeys)?
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-reference</artifactId>
    <name>TwelveMonkeys :: ImageIO :: reference test cases</name>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-sgi</artifactId>
    <name>TwelveMonkeys :: ImageIO :: SGI plugin</name>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -28,48 +28,19 @@

 package com.twelvemonkeys.imageio.plugins.sgi;

-import org.w3c.dom.Node;
+import com.twelvemonkeys.imageio.AbstractMetadata;

-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;

-final class SGIMetadata extends IIOMetadata {
-    // TODO: Clean up & extend AbstractMetadata (after moving from PSD -> Core)
-
+final class SGIMetadata extends AbstractMetadata {
    private final SGIHeader header;

    SGIMetadata(final SGIHeader header) {
        this.header = header;
-        standardFormatSupported = true;
    }

-    @Override public boolean isReadOnly() {
-        return true;
-    }
-
-    @Override public Node getAsTree(final String formatName) {
-        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
-            return getStandardTree();
-        }
-        else {
-            throw new IllegalArgumentException("Unsupported metadata format: " + formatName);
-        }
-    }
-
-    @Override public void mergeTree(final String formatName, final Node root) {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    @Override public void reset() {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    @Override protected IIOMetadataNode getStandardChromaNode() {
+    @Override
+    protected IIOMetadataNode getStandardChromaNode() {
        IIOMetadataNode chroma = new IIOMetadataNode("Chroma");

        // NOTE: There doesn't seem to be any god way to determine color space, other than by convention
@@ -117,12 +88,15 @@ final class SGIMetadata extends IIOMetadata {

    // No compression

-    @Override protected IIOMetadataNode getStandardCompressionNode() {
+    @Override
+    protected IIOMetadataNode getStandardCompressionNode() {
        if (header.getCompression() != SGI.COMPRESSION_NONE) {
            IIOMetadataNode node = new IIOMetadataNode("Compression");

            IIOMetadataNode compressionTypeName = new IIOMetadataNode("CompressionTypeName");
-            compressionTypeName.setAttribute("value", header.getCompression() == SGI.COMPRESSION_RLE ? "RLE" : "Uknown");
+            compressionTypeName.setAttribute("value", header.getCompression() == SGI.COMPRESSION_RLE
+                                                      ? "RLE"
+                                                      : "Uknown");
            node.appendChild(compressionTypeName);

            IIOMetadataNode lossless = new IIOMetadataNode("Lossless");
@@ -135,7 +109,8 @@ final class SGIMetadata extends IIOMetadata {
        return null;
    }

-    @Override protected IIOMetadataNode getStandardDataNode() {
+    @Override
+    protected IIOMetadataNode getStandardDataNode() {
        IIOMetadataNode node = new IIOMetadataNode("Data");

        IIOMetadataNode sampleFormat = new IIOMetadataNode("SampleFormat");
@@ -183,7 +158,8 @@ final class SGIMetadata extends IIOMetadata {
        return buffer.toString();
    }

-    @Override protected IIOMetadataNode getStandardDimensionNode() {
+    @Override
+    protected IIOMetadataNode getStandardDimensionNode() {
        IIOMetadataNode dimension = new IIOMetadataNode("Dimension");

        IIOMetadataNode imageOrientation = new IIOMetadataNode("ImageOrientation");
@@ -195,7 +171,8 @@ final class SGIMetadata extends IIOMetadata {

    // No document node

-    @Override protected IIOMetadataNode getStandardTextNode() {
+    @Override
+    protected IIOMetadataNode getStandardTextNode() {
        if (!header.getName().isEmpty()) {
            IIOMetadataNode text = new IIOMetadataNode("Text");

@@ -212,14 +189,17 @@ final class SGIMetadata extends IIOMetadata {

    // No tiling

-    @Override protected IIOMetadataNode getStandardTransparencyNode() {
+    @Override
+    protected IIOMetadataNode getStandardTransparencyNode() {
        // NOTE: There doesn't seem to be any god way to determine transparency, other than by convention
        // 1 channel: Gray, 2 channel: Gray + Alpha, 3 channel: RGB, 4 channel: RGBA (hopefully never CMYK...)

        IIOMetadataNode transparency = new IIOMetadataNode("Transparency");

        IIOMetadataNode alpha = new IIOMetadataNode("Alpha");
-        alpha.setAttribute("value", header.getChannels() == 1 || header.getChannels() == 3 ? "none" : "nonpremultiplied");
+        alpha.setAttribute("value", header.getChannels() == 1 || header.getChannels() == 3
+                                    ? "none"
+                                    : "nonpremultiplied");
        transparency.appendChild(alpha);

        return transparency;
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.2-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-tga</artifactId>
    <name>TwelveMonkeys :: ImageIO :: TGA plugin</name>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
        </dependency>
    </dependencies>
 </project>
@@ -29,6 +29,8 @@
 package com.twelvemonkeys.imageio.plugins.tga;

 interface TGA {
+    byte[] MAGIC = {'T', 'R', 'U', 'E', 'V', 'I', 'S', 'I', 'O', 'N', '-', 'X', 'F', 'I', 'L', 'E', '.', 0};
+
    /** Fixed header size: 18.*/
    int HEADER_SIZE = 18;

@@ -0,0 +1,187 @@
+package com.twelvemonkeys.imageio.plugins.tga;
+
+import javax.imageio.IIOException;
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Calendar;
+
+/**
+ * TGAExtensions.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: TGAExtensions.java,v 1.0 27/07/15 harald.kuhr Exp$
+ */
+final class TGAExtensions {
+    public static final int EXT_AREA_SIZE = 495;
+
+    private String authorName;
+    private String authorComments;
+
+    private Calendar creationDate;
+    private String jobId;
+
+    private String softwareId;
+    private String softwareVersion;
+
+    private int backgroundColor;
+    private double pixelAspectRatio;
+    private double gamma;
+
+    private long colorCorrectionOffset;
+    private long postageStampOffset;
+    private long scanLineOffset;
+
+    private int attributeType;
+
+    private TGAExtensions() {
+    }
+
+    static TGAExtensions read(final ImageInputStream stream) throws IOException {
+        int extSize = stream.readUnsignedShort();
+
+        // Should always be 495 for version 2.0, no newer version exists...
+        if (extSize < EXT_AREA_SIZE) {
+            throw new IIOException(String.format("TGA Extension Area size less than %d: %d", EXT_AREA_SIZE, extSize));
+        }
+
+        TGAExtensions extensions = new TGAExtensions();
+        extensions.authorName = readString(stream, 41);;
+        extensions.authorComments = readString(stream, 324);
+        extensions.creationDate = readDate(stream);
+        extensions.jobId = readString(stream, 41);
+
+        stream.skipBytes(6); // Job time, 3 shorts, hours/minutes/seconds elapsed
+
+        extensions.softwareId = readString(stream, 41);
+
+        // Software version (* 100) short + single byte ASCII (ie. 101 'b' for 1.01b)
+        int softwareVersion = stream.readUnsignedShort();
+        int softwareLetter = stream.readByte();
+
+        extensions.softwareVersion = softwareVersion != 0 && softwareLetter != ' '
+                                     ? String.format("%d.%d%d", softwareVersion / 100, softwareVersion % 100, softwareLetter).trim()
+                                     : null;
+
+        extensions.backgroundColor = stream.readInt(); // ARGB
+
+        extensions.pixelAspectRatio = readRational(stream);
+        extensions.gamma = readRational(stream);
+
+        extensions.colorCorrectionOffset = stream.readUnsignedInt();
+        extensions.postageStampOffset = stream.readUnsignedInt();
+        extensions.scanLineOffset = stream.readUnsignedInt();
+
+        // Offset 494 specifies Attribute type:
+        // 0: no Alpha data included (bits 3-0 of field 5.6 should also be set to zero)
+        // 1: undefined data in the Alpha field, can be ignored
+        // 2: undefined data in the Alpha field, but should be retained
+        // 3: useful Alpha channel data is present
+        // 4: pre-multiplied Alpha (see description below)
+        // 5 -127: RESERVED
+        // 128-255: Un-assigned
+        extensions.attributeType = stream.readUnsignedByte();
+
+        return extensions;
+    }
+
+    private static double readRational(final ImageInputStream stream) throws IOException {
+        int numerator = stream.readUnsignedShort();
+        int denominator = stream.readUnsignedShort();
+
+        return denominator != 0 ? numerator / (double) denominator : 1;
+    }
+
+    private static Calendar readDate(final ImageInputStream stream) throws IOException {
+        Calendar calendar = Calendar.getInstance();
+        calendar.clear();
+
+        int month = stream.readUnsignedShort();
+        int date = stream.readUnsignedShort();
+        int year = stream.readUnsignedShort();
+
+        int hourOfDay = stream.readUnsignedShort();
+        int minute = stream.readUnsignedShort();
+        int second = stream.readUnsignedShort();
+
+        // Unused
+        if (month == 0 && year == 0 && date == 0 && hourOfDay == 0 && minute == 0 && second == 0) {
+            return null;
+        }
+
+        calendar.set(year, month - 1, date, hourOfDay, minute, second);
+
+        return calendar;
+    }
+
+    private static String readString(final ImageInputStream stream, final int maxLength) throws IOException {
+        byte[] data = new byte[maxLength];
+        stream.readFully(data);
+
+        return asZeroTerminatedASCIIString(data);
+    }
+
+    private static String asZeroTerminatedASCIIString(final byte[] data) {
+        int len = data.length;
+
+        for (int i = 0; i < data.length; i++) {
+            if (data[i] == 0) {
+                len = i;
+            }
+        }
+
+        return new String(data, 0, len, StandardCharsets.US_ASCII);
+    }
+
+    public boolean hasAlpha() {
+        switch (attributeType) {
+            case 3:
+            case 4:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public boolean isAlphaPremultiplied() {
+        switch (attributeType) {
+            case 4:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public long getThumbnailOffset() {
+        return postageStampOffset;
+    }
+
+    public String getAuthorName() {
+        return authorName;
+    }
+
+    public String getAuthorComments() {
+        return authorComments;
+    }
+
+    public Calendar getCreationDate() {
+        return creationDate;
+    }
+
+    public String getSoftware() {
+        return softwareId;
+    }
+
+    public String getSoftwareVersion() {
+        return softwareVersion;
+    }
+
+    public double getPixelAspectRatio() {
+        return pixelAspectRatio;
+    }
+
+    public int getBackgroundColor() {
+        return backgroundColor;
+    }
+}
@@ -33,6 +33,7 @@ import com.twelvemonkeys.imageio.util.IIOUtil;
 import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
 import com.twelvemonkeys.io.LittleEndianDataInputStream;
 import com.twelvemonkeys.io.enc.DecoderStream;
+import com.twelvemonkeys.lang.Validate;
 import com.twelvemonkeys.xml.XMLSerializer;

 import javax.imageio.IIOException;
@@ -51,6 +52,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;

@@ -59,6 +61,7 @@ public final class TGAImageReader extends ImageReaderBase {
    // http://www.gamers.org/dEngine/quake3/TGA.txt

    private TGAHeader header;
+    private TGAExtensions extensions;

    protected TGAImageReader(final ImageReaderSpi provider) {
        super(provider);
@@ -67,6 +70,7 @@ public final class TGAImageReader extends ImageReaderBase {
    @Override
    protected void resetMembers() {
        header = null;
+        extensions = null;
    }

    @Override
@@ -89,7 +93,7 @@ public final class TGAImageReader extends ImageReaderBase {
    public Iterator<ImageTypeSpecifier> getImageTypes(final int imageIndex) throws IOException {
        ImageTypeSpecifier rawType = getRawImageType(imageIndex);

-        List<ImageTypeSpecifier> specifiers = new ArrayList<ImageTypeSpecifier>();
+        List<ImageTypeSpecifier> specifiers = new ArrayList<>();

        // TODO: Implement
        specifiers.add(rawType);
@@ -110,19 +114,29 @@ public final class TGAImageReader extends ImageReaderBase {
                return ImageTypeSpecifiers.createFromIndexColorModel(header.getColorMap());
            case TGA.IMAGETYPE_MONOCHROME:
            case TGA.IMAGETYPE_MONOCHROME_RLE:
-                return ImageTypeSpecifiers.createGrayscale(1, DataBuffer.TYPE_BYTE);
+                return ImageTypeSpecifiers.createGrayscale(8, DataBuffer.TYPE_BYTE);
            case TGA.IMAGETYPE_TRUECOLOR:
            case TGA.IMAGETYPE_TRUECOLOR_RLE:
                ColorSpace sRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB);

+                boolean hasAlpha = header.getAttributeBits() > 0 && extensions != null && extensions.hasAlpha();
+                boolean isAlphaPremultiplied = extensions != null && extensions.isAlphaPremultiplied();
+
                switch (header.getPixelDepth()) {
                    case 16:
+                        if (hasAlpha) {
+                            // USHORT_1555_ARGB...
+                            return ImageTypeSpecifiers.createPacked(sRGB, 0x7C00, 0x03E0, 0x001F, 0x8000, DataBuffer.TYPE_USHORT, isAlphaPremultiplied);
+                        }
+                        // Default mask out alpha
                        return ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_USHORT_555_RGB);
                    case 24:
                        return ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR);
                    case 32:
-                        // 4BYTE_BGRA...
-                        return ImageTypeSpecifiers.createInterleaved(sRGB, new int[] {2, 1, 0, 3}, DataBuffer.TYPE_BYTE, true, false);
+                        // 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 truecolor: " + header.getPixelDepth());
                }
@@ -166,31 +180,32 @@ public final class TGAImageReader extends ImageReaderBase {
        DataInput input;
        if (imageType == TGA.IMAGETYPE_COLORMAPPED_RLE || imageType == TGA.IMAGETYPE_TRUECOLOR_RLE || imageType == TGA.IMAGETYPE_MONOCHROME_RLE) {
            input = new LittleEndianDataInputStream(new DecoderStream(IIOUtil.createStreamAdapter(imageInput), new RLEDecoder(header.getPixelDepth())));
-        } else {
+        }
+        else {
            input = imageInput;
        }

        for (int y = 0; y < height; y++) {
            switch (header.getPixelDepth()) {
-                    case 8:
-                    case 24:
-                    case 32:
-                        byte[] rowDataByte = ((DataBufferByte) rowRaster.getDataBuffer()).getData();
-                        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, header.getOrigin(), xSub, ySub, rowDataUShort, destRaster, clippedRow, y);
-                        break;
-                    default:
-                        throw new AssertionError("Unsupported pixel depth: " + header.getPixelDepth());
-                }
-
-                processImageProgress(100f * y / height);
-
-                if (height - 1 - y < srcRegion.y) {
+                case 8:
+                case 24:
+                case 32:
+                    byte[] rowDataByte = ((DataBufferByte) rowRaster.getDataBuffer()).getData();
+                    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, header.getOrigin(), xSub, ySub, rowDataUShort, destRaster, clippedRow, y);
+                    break;
+                default:
+                    throw new AssertionError("Unsupported pixel depth: " + header.getPixelDepth());
+            }
+
+            processImageProgress(100f * y / height);
+
+            if (height - 1 - y < srcRegion.y) {
+                break;
+            }

            if (abortRequested()) {
                processReadAborted();
@@ -212,11 +227,11 @@ public final class TGAImageReader extends ImageReaderBase {
            return;
        }

-
        input.readFully(rowDataByte, 0, rowDataByte.length);

-        if (srcChannel.getNumBands() == 4) {
-            invertAlpha(rowDataByte);
+        if (srcChannel.getNumBands() == 4 && (header.getAttributeBits() == 0 || extensions != null && !extensions.hasAlpha())) {
+            // Remove the alpha channel (make pixels opaque) if there are no "attribute bits" (alpha bits)
+            removeAlpha32(rowDataByte);
        }

        // Subsample horizontal
@@ -240,9 +255,9 @@ public final class TGAImageReader extends ImageReaderBase {
        }
    }

-    private void invertAlpha(final byte[] rowDataByte) {
-        for (int i = 3; i < rowDataByte.length; i += 4) {
-            rowDataByte[i] = (byte) (0xFF - rowDataByte[i]);
+    private void removeAlpha32(final byte[] rowData) {
+        for (int i = 3; i < rowData.length; i += 4) {
+            rowData[i] = (byte) 0xFF;
        }
    }

@@ -313,21 +328,154 @@ public final class TGAImageReader extends ImageReaderBase {
    private void readHeader() throws IOException {
        if (header == null) {
            imageInput.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+
+            // Read header
            header = TGAHeader.read(imageInput);

 //            System.err.println("header: " + header);

            imageInput.flushBefore(imageInput.getStreamPosition());
+
+            // Read footer, if 2.0 format (ends with TRUEVISION-XFILE\0)
+            skipToEnd(imageInput);
+            imageInput.seek(imageInput.getStreamPosition() - 26);
+
+            long extOffset = imageInput.readInt();
+            /*long devOffset = */imageInput.readInt(); // Ignored for now
+
+            byte[] magic = new byte[18];
+            imageInput.readFully(magic);
+
+            if (Arrays.equals(magic, TGA.MAGIC)) {
+                if (extOffset > 0) {
+                    imageInput.seek(extOffset);
+                    extensions = TGAExtensions.read(imageInput);
+                }
+            }
        }

        imageInput.seek(imageInput.getFlushedPosition());
    }

-    @Override public IIOMetadata getImageMetadata(final int imageIndex) throws IOException {
+    // TODO: Candidate util method
+    private static void skipToEnd(final ImageInputStream stream) throws IOException {
+        if (stream.length() > 0) {
+            // Seek to end of file
+            stream.seek(stream.length());
+        }
+        else {
+            // Skip to end
+            long lastGood = stream.getStreamPosition();
+
+            while (stream.read() != -1) {
+                lastGood = stream.getStreamPosition();
+                stream.skipBytes(1024);
+            }
+
+            stream.seek(lastGood);
+
+            while (true) {
+                if (stream.read() == -1) {
+                    break;
+                }
+                // Just continue reading to EOF...
+            }
+        }
+    }
+
+    // Thumbnail support
+
+    @Override
+    public boolean readerSupportsThumbnails() {
+        return true;
+    }
+
+    @Override
+    public boolean hasThumbnails(final int imageIndex) throws IOException {
        checkBounds(imageIndex);
        readHeader();

-        return new TGAMetadata(header);
+        return extensions != null && extensions.getThumbnailOffset() > 0;
+    }
+
+    @Override
+    public int getNumThumbnails(final int imageIndex) throws IOException {
+        return hasThumbnails(imageIndex) ? 1 : 0;
+    }
+
+    @Override
+    public int getThumbnailWidth(final int imageIndex, final int thumbnailIndex) throws IOException {
+        checkBounds(imageIndex);
+        Validate.isTrue(thumbnailIndex >= 0 && thumbnailIndex < getNumThumbnails(imageIndex), "thumbnailIndex >= numThumbnails");
+
+        imageInput.seek(extensions.getThumbnailOffset());
+
+        return imageInput.readUnsignedByte();
+    }
+
+    @Override
+    public int getThumbnailHeight(final int imageIndex, final int thumbnailIndex) throws IOException {
+        getThumbnailWidth(imageIndex, thumbnailIndex); // Laziness...
+
+        return imageInput.readUnsignedByte();
+    }
+
+    @Override
+    public BufferedImage readThumbnail(final int imageIndex, final int thumbnailIndex) throws IOException {
+        Iterator<ImageTypeSpecifier> imageTypes = getImageTypes(imageIndex);
+        ImageTypeSpecifier rawType = getRawImageType(imageIndex);
+
+        int width = getThumbnailWidth(imageIndex, thumbnailIndex);
+        int height = getThumbnailHeight(imageIndex, thumbnailIndex);
+
+        // For thumbnail, always read entire image
+        Rectangle srcRegion = new Rectangle(width, height);
+
+        BufferedImage destination = getDestination(null, imageTypes, width, height);
+        WritableRaster destRaster = destination.getRaster();
+        WritableRaster rowRaster = rawType.createBufferedImage(width, 1).getRaster();
+
+        processThumbnailStarted(imageIndex, thumbnailIndex);
+
+        // Thumbnail is always stored non-compressed, no need for RLE support
+        imageInput.seek(extensions.getThumbnailOffset() + 2);
+
+        for (int y = 0; y < height; y++) {
+            switch (header.getPixelDepth()) {
+                case 8:
+                case 24:
+                case 32:
+                    byte[] rowDataByte = ((DataBufferByte) rowRaster.getDataBuffer()).getData();
+                    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, header.getOrigin(), 1, 1, rowDataUShort, destRaster, rowRaster, y);
+                    break;
+                default:
+                    throw new AssertionError("Unsupported pixel depth: " + header.getPixelDepth());
+            }
+
+            processThumbnailProgress(100f * y / height);
+
+            if (height - 1 - y < srcRegion.y) {
+                break;
+            }
+        }
+
+        processThumbnailComplete();
+
+        return destination;
+    }
+
+    // Metadata support
+
+    @Override
+    public IIOMetadata getImageMetadata(final int imageIndex) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        return new TGAMetadata(header, extensions);
    }

    public static void main(String[] args) throws IOException {
@@ -45,7 +45,8 @@ public final class TGAImageReaderSpi extends ImageReaderSpiBase {
        super(new TGAProviderInfo());
    }

-    @Override public boolean canDecodeInput(final Object source) throws IOException {
+    @Override
+    public boolean canDecodeInput(final Object source) throws IOException {
        if (!(source instanceof ImageInputStream)) {
            return false;
        }
@@ -58,7 +59,7 @@ public final class TGAImageReaderSpi extends ImageReaderSpiBase {
        try {
            stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);

-            // NOTE: The TGA format does not have a magic identifier, so this is guesswork...
+            // NOTE: The original TGA format does not have a magic identifier, so this is guesswork...
            // We'll try to match sane values, and hope no other files contains the same sequence.

            stream.readUnsignedByte();
@@ -88,11 +89,11 @@ public final class TGAImageReaderSpi extends ImageReaderSpiBase {

            int colorMapStart = stream.readUnsignedShort();
            int colorMapSize = stream.readUnsignedShort();
-            int colorMapDetph = stream.readUnsignedByte();
+            int colorMapDepth = stream.readUnsignedByte();

            if (colorMapSize == 0) {
                // No color map, all 3 fields should be 0
-                if (colorMapStart!= 0 || colorMapDetph != 0) {
+                if (colorMapStart != 0 || colorMapDepth != 0) {
                    return false;
                }
            }
@@ -106,7 +107,7 @@ public final class TGAImageReaderSpi extends ImageReaderSpiBase {
                if (colorMapStart >= colorMapSize) {
                    return false;
                }
-                if (colorMapDetph != 15 && colorMapDetph != 16 && colorMapDetph != 24 && colorMapDetph != 32) {
+                if (colorMapDepth != 15 && colorMapDepth != 16 && colorMapDepth != 24 && colorMapDepth != 32) {
                    return false;
                }
            }
@@ -134,6 +135,7 @@ public final class TGAImageReaderSpi extends ImageReaderSpiBase {

            // We're pretty sure by now, but there can still be false positives...
            // For 2.0 format, we could skip to end, and read "TRUEVISION-XFILE.\0" but it would be too slow
+            // unless we are working with a local file (and the file may still be a valid original TGA without it).
            return true;
        }
        finally {
@@ -28,53 +28,29 @@

 package com.twelvemonkeys.imageio.plugins.tga;

-import org.w3c.dom.Node;
+import com.twelvemonkeys.imageio.AbstractMetadata;

-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;
+import java.awt.*;
 import java.awt.image.IndexColorModel;
+import java.util.Calendar;

-final class TGAMetadata extends IIOMetadata {
-    // TODO: Clean up & extend AbstractMetadata (after moving from PSD -> Core)
-
+final class TGAMetadata extends AbstractMetadata {
    private final TGAHeader header;
+    private final TGAExtensions extensions;

-    TGAMetadata(final TGAHeader header) {
+    TGAMetadata(final TGAHeader header, final TGAExtensions extensions) {
        this.header = header;
-        standardFormatSupported = true;
+        this.extensions = extensions;
    }

-    @Override public boolean isReadOnly() {
-        return true;
-    }
-
-    @Override public Node getAsTree(final String formatName) {
-        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
-            return getStandardTree();
-        }
-        else {
-            throw new IllegalArgumentException("Unsupported metadata format: " + formatName);
-        }
-    }
-
-    @Override public void mergeTree(final String formatName, final Node root) {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    @Override public void reset() {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-
-    @Override protected IIOMetadataNode getStandardChromaNode() {
+    @Override
+    protected IIOMetadataNode getStandardChromaNode() {
        IIOMetadataNode chroma = new IIOMetadataNode("Chroma");

        IIOMetadataNode csType = new IIOMetadataNode("ColorSpaceType");
+        chroma.appendChild(csType);
+
        switch (header.getImageType()) {
            case TGA.IMAGETYPE_MONOCHROME:
            case TGA.IMAGETYPE_MONOCHROME_RLE:
@@ -92,15 +68,22 @@ final class TGAMetadata extends IIOMetadata {
            default:
                csType.setAttribute("name", "Unknown");
        }
-        chroma.appendChild(csType);

-        // TODO: Channels in chroma node reflects channels in color model (see data node, for channels in data)
+        // NOTE: Channels in chroma node reflects channels in color model (see data node, for channels in data)
        IIOMetadataNode numChannels = new IIOMetadataNode("NumChannels");
+        chroma.appendChild(numChannels);
        switch (header.getPixelDepth()) {
            case 8:
-            case 16:
                numChannels.setAttribute("value", Integer.toString(1));
                break;
+            case 16:
+                if (header.getAttributeBits() > 0 && extensions != null && extensions.hasAlpha()) {
+                    numChannels.setAttribute("value", Integer.toString(4));
+                }
+                else {
+                    numChannels.setAttribute("value", Integer.toString(3));
+                }
+                break;
            case 24:
                numChannels.setAttribute("value", Integer.toString(3));
                break;
@@ -108,11 +91,10 @@ final class TGAMetadata extends IIOMetadata {
                numChannels.setAttribute("value", Integer.toString(4));
                break;
        }
-        chroma.appendChild(numChannels);

        IIOMetadataNode blackIsZero = new IIOMetadataNode("BlackIsZero");
-        blackIsZero.setAttribute("value", "TRUE");
        chroma.appendChild(blackIsZero);
+        blackIsZero.setAttribute("value", "TRUE");

        // NOTE: TGA files may contain a color map, even if true color...
        // Not sure if this is a good idea to expose to the meta data,
@@ -124,20 +106,31 @@ final class TGAMetadata extends IIOMetadata {

            for (int i = 0; i < colorMap.getMapSize(); i++) {
                IIOMetadataNode paletteEntry = new IIOMetadataNode("PaletteEntry");
+                palette.appendChild(paletteEntry);
                paletteEntry.setAttribute("index", Integer.toString(i));

                paletteEntry.setAttribute("red", Integer.toString(colorMap.getRed(i)));
                paletteEntry.setAttribute("green", Integer.toString(colorMap.getGreen(i)));
                paletteEntry.setAttribute("blue", Integer.toString(colorMap.getBlue(i)));
-
-                palette.appendChild(paletteEntry);
            }
        }

+        if (extensions != null && extensions.getBackgroundColor() != 0) {
+            Color background = new Color(extensions.getBackgroundColor(), true);
+
+            IIOMetadataNode backgroundColor = new IIOMetadataNode("BackgroundColor");
+            chroma.appendChild(backgroundColor);
+
+            backgroundColor.setAttribute("red", Integer.toString(background.getRed()));
+            backgroundColor.setAttribute("green", Integer.toString(background.getGreen()));
+            backgroundColor.setAttribute("blue", Integer.toString(background.getBlue()));
+        }
+
        return chroma;
    }

-    @Override protected IIOMetadataNode getStandardCompressionNode() {
+    @Override
+    protected IIOMetadataNode getStandardCompressionNode() {
        switch (header.getImageType()) {
            case TGA.IMAGETYPE_COLORMAPPED_RLE:
            case TGA.IMAGETYPE_TRUECOLOR_RLE:
@@ -145,15 +138,16 @@ final class TGAMetadata extends IIOMetadata {
            case TGA.IMAGETYPE_COLORMAPPED_HUFFMAN:
            case TGA.IMAGETYPE_COLORMAPPED_HUFFMAN_QUADTREE:
                IIOMetadataNode node = new IIOMetadataNode("Compression");
+
                IIOMetadataNode compressionTypeName = new IIOMetadataNode("CompressionTypeName");
-                String value = header.getImageType() == TGA.IMAGETYPE_COLORMAPPED_HUFFMAN || header.getImageType() == TGA.IMAGETYPE_COLORMAPPED_HUFFMAN_QUADTREE
-                                ? "Uknown" : "RLE";
-                compressionTypeName.setAttribute("value", value);
                node.appendChild(compressionTypeName);
+                String value = header.getImageType() == TGA.IMAGETYPE_COLORMAPPED_HUFFMAN || header.getImageType() == TGA.IMAGETYPE_COLORMAPPED_HUFFMAN_QUADTREE
+                               ? "Uknown" : "RLE";
+                compressionTypeName.setAttribute("value", value);

                IIOMetadataNode lossless = new IIOMetadataNode("Lossless");
-                lossless.setAttribute("value", "TRUE");
                node.appendChild(lossless);
+                lossless.setAttribute("value", "TRUE");

                return node;
            default:
@@ -162,14 +156,17 @@ final class TGAMetadata extends IIOMetadata {
        }
    }

-    @Override protected IIOMetadataNode getStandardDataNode() {
+    @Override
+    protected IIOMetadataNode getStandardDataNode() {
        IIOMetadataNode node = new IIOMetadataNode("Data");

        IIOMetadataNode planarConfiguration = new IIOMetadataNode("PlanarConfiguration");
-        planarConfiguration.setAttribute("value", "PixelInterleaved");
        node.appendChild(planarConfiguration);
+        planarConfiguration.setAttribute("value", "PixelInterleaved");

        IIOMetadataNode sampleFormat = new IIOMetadataNode("SampleFormat");
+        node.appendChild(sampleFormat);
+
        switch (header.getImageType()) {
            case TGA.IMAGETYPE_COLORMAPPED:
            case TGA.IMAGETYPE_COLORMAPPED_RLE:
@@ -182,13 +179,19 @@ final class TGAMetadata extends IIOMetadata {
                break;
        }

-        node.appendChild(sampleFormat);
-
        IIOMetadataNode bitsPerSample = new IIOMetadataNode("BitsPerSample");
+        node.appendChild(bitsPerSample);
+
        switch (header.getPixelDepth()) {
            case 8:
-            case 16:
                bitsPerSample.setAttribute("value", createListValue(1, Integer.toString(header.getPixelDepth())));
+            case 16:
+                if (header.getAttributeBits() > 0 && extensions != null && extensions.hasAlpha()) {
+                    bitsPerSample.setAttribute("value", "5, 5, 5, 1");
+                }
+                else {
+                    bitsPerSample.setAttribute("value", createListValue(3, "5"));
+                }
                break;
            case 24:
                bitsPerSample.setAttribute("value", createListValue(3, Integer.toString(8)));
@@ -198,12 +201,6 @@ final class TGAMetadata extends IIOMetadata {
                break;
        }

-        node.appendChild(bitsPerSample);
-
-        // TODO: Do we need MSB?
-//        IIOMetadataNode sampleMSB = new IIOMetadataNode("SampleMSB");
-//        sampleMSB.setAttribute("value", createListValue(header.getChannels(), "0"));
-
        return node;
    }

@@ -221,10 +218,12 @@ final class TGAMetadata extends IIOMetadata {
        return buffer.toString();
    }

-    @Override protected IIOMetadataNode getStandardDimensionNode() {
+    @Override
+    protected IIOMetadataNode getStandardDimensionNode() {
        IIOMetadataNode dimension = new IIOMetadataNode("Dimension");

        IIOMetadataNode imageOrientation = new IIOMetadataNode("ImageOrientation");
+        dimension.appendChild(imageOrientation);

        switch (header.getOrigin()) {
            case TGA.ORIGIN_LOWER_LEFT:
@@ -241,38 +240,90 @@ final class TGAMetadata extends IIOMetadata {
                break;
        }

-        dimension.appendChild(imageOrientation);
+        IIOMetadataNode pixelAspectRatio = new IIOMetadataNode("PixelAspectRatio");
+        dimension.appendChild(pixelAspectRatio);
+        pixelAspectRatio.setAttribute("value", extensions != null ? String.valueOf(extensions.getPixelAspectRatio()) : "1.0");

        return dimension;
    }

-    // No document node
+    @Override
+    protected IIOMetadataNode getStandardDocumentNode() {
+        IIOMetadataNode document = new IIOMetadataNode("Document");

-    @Override protected IIOMetadataNode getStandardTextNode() {
-        // TODO: Extra "developer area" and other stuff might go here...
-        if (header.getIdentification() != null && !header.getIdentification().isEmpty()) {
-            IIOMetadataNode text = new IIOMetadataNode("Text");
+        IIOMetadataNode formatVersion = new IIOMetadataNode("FormatVersion");
+        document.appendChild(formatVersion);
+        formatVersion.setAttribute("value", extensions == null ? "1.0" : "2.0");

-            IIOMetadataNode textEntry = new IIOMetadataNode("TextEntry");
-            textEntry.setAttribute("keyword", "identification");
-            textEntry.setAttribute("value", header.getIdentification());
-            text.appendChild(textEntry);
+        // ImageCreationTime from extensions date
+        if (extensions != null && extensions.getCreationDate() != null) {
+            IIOMetadataNode imageCreationTime = new IIOMetadataNode("ImageCreationTime");
+            document.appendChild(imageCreationTime);

-            return text;
+            Calendar date = extensions.getCreationDate();
+
+            imageCreationTime.setAttribute("year", String.valueOf(date.get(Calendar.YEAR)));
+            imageCreationTime.setAttribute("month", String.valueOf(date.get(Calendar.MONTH) + 1));
+            imageCreationTime.setAttribute("day", String.valueOf(date.get(Calendar.DAY_OF_MONTH)));
+            imageCreationTime.setAttribute("hour", String.valueOf(date.get(Calendar.HOUR_OF_DAY)));
+            imageCreationTime.setAttribute("minute", String.valueOf(date.get(Calendar.MINUTE)));
+            imageCreationTime.setAttribute("second", String.valueOf(date.get(Calendar.SECOND)));
        }

-        return null;
+        return document;
+    }
+
+    @Override
+    protected IIOMetadataNode getStandardTextNode() {
+        IIOMetadataNode text = new IIOMetadataNode("Text");
+
+        // NOTE: Names corresponds to equivalent fields in TIFF
+        if (header.getIdentification() != null && !header.getIdentification().isEmpty()) {
+            appendTextEntry(text, "DocumentName", header.getIdentification());
+        }
+
+        if (extensions != null) {
+            appendTextEntry(text, "Software", extensions.getSoftwareVersion() == null ? extensions.getSoftware() : extensions.getSoftware() + " " + extensions.getSoftwareVersion());
+            appendTextEntry(text, "Artist", extensions.getAuthorName());
+            appendTextEntry(text, "UserComment", extensions.getAuthorComments());
+        }
+
+        return text.hasChildNodes() ? text : null;
+    }
+
+    private void appendTextEntry(final IIOMetadataNode parent, final String keyword, final String value) {
+        if (value != null) {
+            IIOMetadataNode textEntry = new IIOMetadataNode("TextEntry");
+            parent.appendChild(textEntry);
+            textEntry.setAttribute("keyword", keyword);
+            textEntry.setAttribute("value", value);
+        }
    }

    // No tiling

-    @Override protected IIOMetadataNode getStandardTransparencyNode() {
+    @Override
+    protected IIOMetadataNode getStandardTransparencyNode() {
        IIOMetadataNode transparency = new IIOMetadataNode("Transparency");

        IIOMetadataNode alpha = new IIOMetadataNode("Alpha");
-        alpha.setAttribute("value", header.getPixelDepth() == 32 ? "nonpremultiplied" : "none");
        transparency.appendChild(alpha);

+        if (extensions != null) {
+            if (extensions.hasAlpha()) {
+                alpha.setAttribute("value", extensions.isAlphaPremultiplied() ? "premultiplied" : "nonpremultiplied");
+            }
+            else {
+                alpha.setAttribute("value", "none");
+            }
+        }
+        else if (header.getAttributeBits() == 8) {
+            alpha.setAttribute("value", "nonpremultiplied");
+        }
+        else {
+            alpha.setAttribute("value", "none");
+        }
+
        return transparency;
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harald Kuhr	5c1d72fd46	[maven-release-plugin] prepare for next development iteration	2015-12-11 12:33:14 +01:00
Harald Kuhr	94d480ec64	[maven-release-plugin] prepare release twelvemonkeys-3.2.1	2015-12-11 12:33:08 +01:00
Harald Kuhr	9654a924b7	Updated versions and fixed Batik depdendencies for 1.6.1	2015-12-04 23:27:23 +01:00
Harald Kuhr	6d9acaee2d	Fixed latest version header, it's really 3.2	2015-12-04 21:26:41 +01:00
Harald Kuhr	fdad13e28f	Removed done item from todos.	2015-12-04 21:26:34 +01:00
Harald Kuhr	6ce58dd682	#195 ArrayIndexOutOfBoundsException for ResampleOp in certain cases	2015-12-04 21:26:26 +01:00
Harald Kuhr	f21bc2089a	Updated README with info on Batik versions.	2015-12-04 21:26:15 +01:00
Harald Kuhr	65f3bbbccd	#191 Support for SVG files without XML declaration	2015-12-04 21:25:42 +01:00
Schmidor	8346c4148e	Testcase for "Fixed an issue with long runlengths in CCITTFax writing #188 "	2015-12-04 21:25:02 +01:00
Schmidor	7c0b4fd91a	Fixed an issue with long runlengths in CCITTFax writing	2015-12-04 21:21:44 +01:00
Harald Kuhr	b818454a3f	Updated for latest release.	2015-12-04 21:21:33 +01:00
Harald Kuhr	9c8b4ad0d4	Updating TODOs.	2015-12-04 21:20:47 +01:00
Harald Kuhr	9c9d2c700e	[maven-release-plugin] prepare release twelvemonkeys-3.2	2015-11-01 19:51:34 +01:00
Harald Kuhr	062413d2d8	#187 Removing hardcoded test path/debug code.	2015-10-23 12:53:28 +02:00
Harald Kuhr	e62922eb95	#184 Re-read the spec, that says ICC and ITU lab uses D50 by default.	2015-10-22 22:14:48 +02:00
Harald Kuhr	302035443d	#173 Support for PhotometricInterpretation 8/CIELab, 9/ICCLab and 10/ITULab	2015-10-22 21:35:36 +02:00
Harald Kuhr	8a38b2fde6	#173 Support for PhotometricInterpretation 8/CIELab, 9/ICCLab and 10/ITULab	2015-10-22 21:35:10 +02:00
Harald Kuhr	30a7283b35	Enabling build status on the front page.	2015-10-16 11:04:07 +02:00
Harald Kuhr	4b363a0d64	Disabling OpenJDK in Travis for now.	2015-10-16 10:56:59 +02:00
Harald Kuhr	1096f9bedd	Testting Travis CI	2015-10-16 10:38:20 +02:00
Harald Kuhr	73a609a2cb	#183 : Minor change, use Map instead of concrete HashMap.	2015-10-15 22:23:45 +02:00
Harald Kuhr	8379f08d78	#183 : Fix failing tests after merge.	2015-10-15 22:21:49 +02:00
Harald Kuhr	c33cfea02c	Merge pull request #183 from Schmidor/CCITTWriter CCITTFaxEncoderStream for TiffImageWriter	2015-10-15 22:16:46 +02:00
Harald Kuhr	b85d0f7d6b	#179 : Fixed broken offsets for 16 and 32 bits PackBits data.	2015-10-15 19:06:05 +02:00
Harald Kuhr	b6e44c5bff	#184 Support for PlanarConfiguration 2 + bonus changes.	2015-10-15 17:47:20 +02:00
Schmidor	e5c0fead38	Fix BlackIsZero handling in CCITTFaxEncoderStream	2015-10-11 17:59:01 +02:00
Schmidor	306a8ae166	Change PhotometricInterpretation / SamplesPerPixel detection for one bit per pixel ColorSpaces	2015-10-11 17:31:28 +02:00
Schmidor	6c702c447b	CCITT Fax writer: fill should only add bits if byte is not empty	2015-10-11 16:34:37 +02:00
Schmidor	237079bcc9	Normalize Black on byte Data	2015-10-11 16:32:39 +02:00
Schmidor	07617b49ce	Support CCITT Fax Encoder in TiffImageWriter	2015-10-10 16:31:40 +02:00
Schmidor	c8621439c0	CCITT Fax writer: adjust formatting and write finishing bytes on last row instead of on stream closing	2015-10-09 23:32:09 +02:00
Schmidor	585b5faa62	Merge remote-tracking branch 'remotes/haraldk/master' into CCITTWriter	2015-10-08 01:12:13 +02:00
Schmidor	39b92ab19f	Work in progress: CCITT Encoder	2015-10-08 00:38:31 +02:00
Schmidor	8e11d95fd6	Work in progress: CCITT Encoder	2015-10-04 00:40:36 +02:00
Harald Kuhr	867ca61755	TMI #172 : Fix IIOBE/Buffer overflow issue.	2015-08-26 11:16:35 +02:00
Harald Kuhr	2bdfa4fccb	TMI-TIFF: Better ICC profile support + more BitsPerSample configurations.	2015-08-26 10:33:01 +02:00
Harald Kuhr	d4e34d6109	TMI #170 Fix General CMM error517/LCMS error 13 (Ignore incompatible ICC profile)	2015-08-25 14:13:35 +02:00
Harald Kuhr	25bef72ac0	TMI #170 Fix General CMM error517/LCMS error 13 (Ignore incompatible ICC profile)	2015-08-25 14:12:47 +02:00
Harald Kuhr	e957120480	TMI #169 NullPointerException when reading JPEG image	2015-08-25 12:12:10 +02:00
Harald Kuhr	35edfc519f	TMI #168 : Change Maven test dependencies from classifier test to type test-jar for better sbt support	2015-08-24 11:09:15 +02:00
Harald Kuhr	df735b9a45	TMI #168 : Change Maven test dependencies from classifier test to type test-jar for better sbt support	2015-08-24 11:07:17 +02:00
Harald Kuhr	99c5fea005	TMI #166 Remove printStackTrace() from EXIFReader	2015-08-21 15:24:49 +02:00
Harald Kuhr	4b70b0cf1c	TMI #165 ICOImageReader prints debug information.	2015-08-21 12:57:29 +02:00
Harald Kuhr	22e490ca40	TMI #164 Support for TIFF with 32 but floating point samples.	2015-08-21 10:49:46 +02:00
Harald Kuhr	211b31e154	TMI #163 Support for TIFF containing signed integral other than 16 bit.	2015-08-21 10:38:38 +02:00
Harald Kuhr	f7d9a64e41	TMI #162 Support for TIFF containing gray + alpha.	2015-08-20 17:06:19 +02:00
Harald Kuhr	5c76899c04	Fixed link to point to page 1.	2015-08-14 14:50:35 +02:00
Harald Kuhr	d792f0b7c4	Updating links and info to latest release, 3.1.2	2015-08-14 12:54:58 +02:00
Harald Kuhr	077e40acf2	TMI#159: Clean-up after merge + added test cases for the CCITT images.	2015-08-14 09:58:15 +02:00
Harald Kuhr	40b11710ea	Merge pull request #160 from Schmidor/master Fix for Issue #159	2015-08-14 09:32:31 +02:00
Schmidor	d86af8bd82	Remove debug output	2015-08-13 23:45:38 +02:00
Schmidor	60e3d6e5af	Fix ArrayIndexOutOfBoundsException in CCITTFaxDecoderStream.decode2D #159	2015-08-13 23:27:46 +02:00
Oliver Schmidtmer	6ef5a5a7ee	Merge pull request #2 from haraldk/master merge from upstream	2015-08-13 18:05:16 +02:00
Harald Kuhr	61b07cb9cb	TMI-139: Support for writing TIFF files with custom resolution value (made TIFFImageMetadata class public).	2015-08-12 11:03:31 +02:00
Harald Kuhr	c913ef445b	TMI-139: Support for writing TIFF files with custom resolution value.	2015-08-12 10:48:58 +02:00
Harald Kuhr	517fc770bd	TMI-136: Better TIFF (IFD) format write support.	2015-08-12 10:23:15 +02:00
Harald Kuhr	998851c9fb	TMI-158: Fixed build instructions. Building with Java 8 should now work without any special settings.	2015-08-04 08:28:29 +02:00
Oliver Schmidtmer	40555641af	Merge pull request #1 from haraldk/master merge from upstream	2015-08-03 13:58:12 +02:00
Harald Kuhr	e1b5e6bfc9	TMI-157: Added imageio-hdr to BOM.	2015-07-31 13:57:22 +02:00
Harald Kuhr	bef0b762fa	TMI-157: Added license headers, and readRaster method for access to the RGBE data.	2015-07-29 09:57:33 +02:00
Harald Kuhr	9bb67742b7	TMI-157: Radiance RGBE (.HDR) support	2015-07-28 22:21:45 +02:00
Harald Kuhr	fd4745f6a6	TMI-156: Now correctly interprets alpha in TGA format + bonus thumbnail & metadata fixes.	2015-07-27 15:07:26 +02:00
Harald Kuhr	4eb7426596	TMI-154: Fix for AccessControlException when reading "Generic CMYK.icc"	2015-07-27 11:58:35 +02:00
Harald Kuhr	1ee22e120d	TMI-61: Re-added some validations, removed printStacktraces, and some minor code style issues after merge.	2015-07-16 23:50:34 +02:00
Harald Kuhr	d8d2764eb1	TMI-TIFF: Added format name synonyms.	2015-07-16 23:22:09 +02:00
Harald Kuhr	94f2b81d2a	Merge pull request #148 from Schmidor/master TMI-61: CCITT Group 3/4 Fax Decoder	2015-07-16 23:17:13 +02:00
Harald Kuhr	d7c8df184e	TMI-JPEG: Reading inverted Adobe JPEGs	2015-07-13 12:28:27 +02:00
Harald Kuhr	d1cb941f06	TMI-150: Fix for 24 bit images with bitmask.	2015-07-11 13:07:20 +02:00
Harald Kuhr	eef4c72daa	Code clean-up.	2015-07-08 23:21:13 +02:00
Schmidor	bad9aebdee	Work in progress: CCITT Encoder	2015-07-05 18:15:43 +02:00
Schmidor	6facef3142	CCITTFax: Output Zero for White	2015-07-05 17:57:04 +02:00
Schmidor	1e6227bee5	CCITT FAX Encoding: Support FillOrder Reversed	2015-07-04 00:42:09 +02:00
Schmidor	62862d835a	CITT Group 3/4 Support - corrected start index in 2d decoding	2015-07-04 00:13:27 +02:00
Schmidor	37e1723891	CITT Group 3/4 Support - libTiff generated files which are the test datastream sources	2015-07-02 23:37:06 +02:00
Schmidor	2b22b02523	CITT Group 3/4 Support - some cleanup, group 3 /T.4 should work now	2015-07-02 23:35:19 +02:00
Schmidor	a2042e75bf	CITT Group 3/4 Support - Pass Mode / 2D Change referencing in work	2015-07-01 01:10:56 +02:00
Harald Kuhr	1a43958aeb	TMI-139: Work in progress: TIFF image metadata.	2015-06-22 11:15:44 +02:00
Harald Kuhr	f4cc310096	TMI-139: Work in progress: TIFF image metadata.	2015-06-22 11:11:37 +02:00
Harald Kuhr	7e65164b87	TMI-146: Now correctly sets ExtraSamples only when there are more components in the raster than color components in the color space.	2015-06-17 13:24:45 +02:00
Harald Kuhr	51ca99d433	Updating readme to latest release.	2015-06-11 12:47:36 +02:00
Harald Kuhr	c80f514131	Updated POM to 3.2-SNAPSHOT	2015-06-11 11:32:46 +02:00
Harald Kuhr	da8a013575	TMI-143: Support for CMYK JPEG in TIFF.	2015-06-11 11:28:31 +02:00
Harald Kuhr	3bdc117aa3	Updated POM to 3.2-SNAPSHOT	2015-06-09 12:12:46 +02:00
Harald Kuhr	f645e46495	Updated POM to 3.2-SNAPSHOT	2015-06-08 14:12:04 +02:00
Harald Kuhr	8052fbc5b8	TMI-142: Added missing resource file, now making sure the TIFFImageWriter is registered.	2015-06-08 11:11:45 +02:00
Harald Kuhr	b2142cb449	Updated to new format name style.	2015-06-05 20:11:54 +02:00
Harald Kuhr	821c20c09a	TMI-136: Clean-up and added TODOs.	2015-06-05 10:58:54 +02:00
Harald Kuhr	194f34894f	Added more PSD resource + clean-up.	2015-06-05 10:50:16 +02:00
Harald Kuhr	f6d5a60600	TMI-136: Added abstract MetadataWriter, along with preliminary IPTCWriter + test cases. Retrofit EXIFWriter. Loads of small changes and clean-up.	2015-06-05 10:49:31 +02:00
Harald Kuhr	bbaa3e1186	TMI-140: JPEG with corrupted ICC profile (new kind) can now be read.	2015-05-28 23:01:51 +02:00
Harald Kuhr	c97ebae303	Fixed JavaDoc (you're welcome Sigi ;-)).	2015-05-27 15:53:50 +02:00
Harald Kuhr	1ed5b3899b	TM-138: DateUtil doesn't support sub-hour offset timezones.	2015-05-27 15:50:35 +02:00
Harald Kuhr	203b330c99	TM-138: DateUtil doesn't support sub-hour offset timezones.	2015-05-27 15:47:26 +02:00
Harald Kuhr	9b71a0cba7	TMI-134: Cannot read PSD images with PSD Layer Mask data size 28	2015-05-05 11:40:54 +02:00
Harald Kuhr	1a8948ece9	TMI-TIFF: Faster LZW encoder.	2015-04-30 10:21:35 +02:00
Harald Kuhr	051a1dcb5b	Preparing JPEGImageReader for extension.	2015-04-30 10:20:35 +02:00
Harald Kuhr	2db58dc73d	Added download links to old version.	2015-04-24 12:45:11 +02:00
Harald Kuhr	835d8a11dd	Added download links to old version.	2015-04-24 12:43:02 +02:00
Harald Kuhr	f3b6d40f19	Fixed typo.	2015-04-12 20:41:00 +02:00
Harald Kuhr	7f34f83768	Updated links and versions (added new plugins to list).	2015-04-12 20:19:17 +02:00
Harald Kuhr	7d0e02fce8	Updated links and versions (now with correct versions...).	2015-04-10 13:20:59 +02:00
Harald Kuhr	429923ec0d	Merge remote-tracking branch 'origin/master'	2015-04-10 13:07:19 +02:00
Harald Kuhr	4dbe10846f	Updated links and versions.	2015-04-10 13:06:59 +02:00
Harald Kuhr	475fdec33f	[maven-release-plugin] prepare for next development iteration	2015-04-10 12:16:14 +02:00
				`@@ -0,0 +1 @@`
				`com.twelvemonkeys.imageio.plugins.hdr.HDRImageReaderSpi`