[maven-release-plugin] prepare release twelvemonkeys-3.8.1

(cherry picked from commit 98e4b76206)

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: haraldk

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,53 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Reported bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Version information**
+1. The version of the TwelveMonkeys ImageIO library in use.
+For example:  4.0.0
+
+2. The *exact* output of `java --version` (or `java -version` for older Java releases). 
+For example: 
+
+    java version "1.8.0_271"
+    Java(TM) SE Runtime Environment (build 1.8.0_271-b09)
+    Java HotSpot(TM) 64-Bit Server VM (build 25.271-b09, mixed mode)
+
+3. Extra information about OS version, server version, standalone program or web application packaging, executable wrapper, etc. Please state exact version numbers where applicable.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Compile the below sample code
+2. Download the sample image file
+3. Run the code with the sample file
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Example code**
+Preferably as a failing JUnit test, or a standalone program with a `main` method that showcases the problem. 
+
+Less is more. Don't add your entire project, only the code required to reproduce the problem. 😀 
+
+**Sample file(s)**
+Attach any sample files needed to reproduce the problem. Use a ZIP-file if the format is not directly supported by GitHub.
+
+**Stak trace**
+Always include the stack trace you experience.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+Do not add screenshots of code or stack traces. 😀 
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: New feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem or use case is. 
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here, like links to specifications or sample files.

.github/ISSUE_TEMPLATE/trouble_shooting_and_programming_help.md

@@ -0,0 +1,13 @@
+---
+name: Trouble shooting and programming help
+about: "General programming issues will reach a wider audience at StackOverflow. Tag
+  questions with javax-imageio and/or twelvemonkeys \U0001F600 "
+title: ''
+labels: Trouble-shooting
+assignees: ''
+
+---
+
+General programming issues and problems will reach a much wider audience at StackOverflow, we suggest you ask them there. This will offload our work with maintaining the library, and make sure you get better help sooner.
+
+Tag the question with `javax-imageio` and/or `twelvemonkeys` and we'll find them there.

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

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

.travis.yml

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

README.md

@@ -1,19 +1,16 @@
-[![Build Status](https://travis-ci.org/haraldk/TwelveMonkeys.svg?branch=master)](https://travis-ci.org/haraldk/TwelveMonkeys) 
+[![Build Status](https://travis-ci.com/haraldk/TwelveMonkeys.svg?branch=master)](https://travis-ci.com/github/haraldk/TwelveMonkeys) 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.twelvemonkeys.imageio/imageio/badge.svg?color=slateblue)](https://maven-badges.herokuapp.com/maven-central/com.twelvemonkeys.imageio/imageio)
 [![StackOverflow](https://img.shields.io/badge/stack_overflow-twelvemonkeys-orange.svg)](https://stackoverflow.com/questions/tagged/twelvemonkeys)
 [![Donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://paypal.me/haraldk76/100)
 
 ## About
 
-TwelveMonkeys ImageIO is a collection of plugins and extensions for Java's ImageIO.
+TwelveMonkeys ImageIO provides extended image file format support for the Java platform, through plugins for the `javax.imageio.*` package.
 
-These plugins extend the number of image file formats supported in Java, using the `javax.imageio.*` package.
-The main purpose of this project is to provide support for formats not covered by the JRE itself.
-
-Support for formats is important, both to be able to read data found
+The main goal of this project is to provide support for formats not covered by the JRE itself. 
+Support for these formats is important, to be able to read data found
 "in the wild", as well as to maintain access to data in legacy formats.
-Because there is lots of legacy data out there, we see the need for open implementations of readers for popular formats.
-The goal is to create a set of efficient and robust ImageIO plug-ins, that can be distributed independently.
+As there is lots of legacy data out there, we see the need for open implementations of readers for popular formats.
 
 ----
 
@@ -34,24 +31,24 @@ The goal is to create a set of efficient and robust ImageIO plug-ins, that can b
 | [PCX](https://github.com/haraldk/TwelveMonkeys/wiki/PCX-Plugin)    | PCX      | ZSoft Paintbrush Format | ✔  | -  | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 |        | DCX      | Multi-page PCX fax document | ✔  | -   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 | [PICT](https://github.com/haraldk/TwelveMonkeys/wiki/PICT-Plugin)   | PICT     | Apple QuickTime Picture Format | ✔  | ✔   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-|        | PNTG     | Apple MacPaint Picture Format | ✔  |     | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
+|        | PNTG     | Apple MacPaint Picture Format | ✔  |  -  | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 | [PNM](https://github.com/haraldk/TwelveMonkeys/wiki/PNM-Plugin)    | PAM      | NetPBM Portable Any Map | ✔  | ✔   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 |        | PBM      | NetPBM Portable Bit Map | ✔  | -     | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 |        | PGM      | NetPBM Portable Grey Map | ✔  | -   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 |        | PPM      | NetPBM Portable Pix Map | ✔  | ✔   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 |        | PFM      | Portable Float Map | ✔  | -   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-| [PSD](https://github.com/haraldk/TwelveMonkeys/wiki/PSD-Plugin)    | **PSD**  | Adobe Photoshop Document | ✔  | - | Native & [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |  
+| [PSD](https://github.com/haraldk/TwelveMonkeys/wiki/PSD-Plugin)    | **PSD**  | Adobe Photoshop Document | ✔  | (✔) | Native & [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |  
 |        |  PSB     | Adobe Photoshop Large Document | ✔  | - | Native & [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 | [SGI](https://github.com/haraldk/TwelveMonkeys/wiki/SGI-Plugin)    | SGI      | Silicon Graphics Image Format  | ✔  | -   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 | [TGA](https://github.com/haraldk/TwelveMonkeys/wiki/TGA-Plugin)    | TGA      | Truevision TGA Image Format  | ✔  | ✔   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 |ThumbsDB| Thumbs.db| MS Windows Thumbs DB | ✔  | -   | - | OLE2 Compound Document based format only
 | [TIFF](https://github.com/haraldk/TwelveMonkeys/wiki/TIFF-Plugin)   | **TIFF** | Aldus/Adobe Tagged Image File Format | ✔  | ✔ | [Native](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/tiff_metadata.html#ImageMetadata) & [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-|        | BigTIFF  |  | ✔  | - | [Native](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/tiff_metadata.html#ImageMetadata) & [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |  
-| [WebP](https://github.com/haraldk/TwelveMonkeys/wiki/WebP-Plugin)   | **WebP** | Google WebP Format | ✔  | - | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |  In progress
+|        | BigTIFF  |  | ✔  | ✔ | [Native](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/tiff_metadata.html#ImageMetadata) & [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |  
+| [WebP](https://github.com/haraldk/TwelveMonkeys/wiki/WebP-Plugin)   | **WebP** | Google WebP Format | ✔  | - | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |  
 | XWD    | XWD      | X11 Window Dump Format | ✔  | -   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 
 
-**Important note on using Batik:** *Please read [The Apache™ XML Graphics Project - Security](http://xmlgraphics.apache.org/security.html), 
+**Important note on using Batik:** *Please read [The Apache™ XML Graphics Project - Security](https://xmlgraphics.apache.org/security.html), 
 and make sure you use version 1.14 or later.*
 
 Note that GIF, PNG and WBMP formats are already supported through the ImageIO API, using the
@@ -166,7 +163,7 @@ finally {
 ```
 
 For more advanced usage, and information on how to use the ImageIO API, I suggest you read the
-[Java Image I/O API Guide](http://docs.oracle.com/javase/7/docs/technotes/guides/imageio/spec/imageio_guideTOC.fm.html)
+[Java Image I/O API Guide](https://docs.oracle.com/javase/7/docs/technotes/guides/imageio/spec/imageio_guideTOC.fm.html)
 from Oracle.
 
 #### Adobe Clipping Path support
@@ -220,14 +217,14 @@ BufferedImage output = ditherer.filter(input, null);
 
 ## Building
 
-Download the project (using [Git](http://git-scm.com/downloads)):
+Download the project (using [Git](https://git-scm.com/downloads)):
 
     $ git clone git@github.com:haraldk/TwelveMonkeys.git
 
 This should create a folder named `TwelveMonkeys` in your current directory. Change directory to the `TwelveMonkeys`
 folder, and issue the command below to build.
 
-Build the project (using [Maven](http://maven.apache.org/download.cgi)):
+Build the project (using [Maven](https://maven.apache.org/download.cgi)):
 
     $ mvn package
 
@@ -274,12 +271,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.6.4</version>
+        <version>3.8.0</version>
     </dependency>
     <dependency>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio-tiff</artifactId>
-        <version>3.6.4</version>
+        <version>3.8.0</version>
     </dependency>
 
     <!--
@@ -289,7 +286,17 @@ To depend on the JPEG and TIFF plugin using Maven, add the following to your POM
     <dependency>
         <groupId>com.twelvemonkeys.servlet</groupId>
         <artifactId>servlet</artifactId>
-        <version>3.6.4</version>
+        <version>3.8.0</version>
+    </dependency>
+
+    <!--
+    Or Jakarta version, for Servlet API 5.0
+    -->
+    <dependency>
+        <groupId>com.twelvemonkeys.servlet</groupId>
+        <artifactId>servlet</artifactId>
+        <version>3.7.0</version>
+        <classifier>jakarta</classifier>
     </dependency>
 </dependencies>
 ```
@@ -298,13 +305,13 @@ 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.6.4.jar
-    twelvemonkeys-common-io-3.6.4.jar
-    twelvemonkeys-common-image-3.6.4.jar
-    twelvemonkeys-imageio-core-3.6.4.jar
-    twelvemonkeys-imageio-metadata-3.6.4.jar
-    twelvemonkeys-imageio-jpeg-3.6.4.jar
-    twelvemonkeys-imageio-tiff-3.6.4.jar
+    twelvemonkeys-common-lang-3.8.0.jar
+    twelvemonkeys-common-io-3.8.0.jar
+    twelvemonkeys-common-image-3.8.0.jar
+    twelvemonkeys-imageio-core-3.8.0.jar
+    twelvemonkeys-imageio-metadata-3.8.0.jar
+    twelvemonkeys-imageio-jpeg-3.8.0.jar
+    twelvemonkeys-imageio-tiff-3.8.0.jar
 
 #### Deploying the plugins in a web app
 
@@ -370,77 +377,79 @@ Other "fat" JAR bundlers will probably have similar mechanisms to merge entries
 
 ### Links to prebuilt binaries
 
-##### Latest version (3.6.4)
+##### Latest version (3.8.0)
 
 Requires Java 7 or later.
  
 Common dependencies
-* [common-lang-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.6.4/common-lang-3.6.4.jar)
-* [common-io-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.6.4/common-io-3.6.4.jar)
-* [common-image-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.6.4/common-image-3.6.4.jar)
+* [common-lang-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.8.0/common-lang-3.8.0.jar)
+* [common-io-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.8.0/common-io-3.8.0.jar)
+* [common-image-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.8.0/common-image-3.8.0.jar)
 
 ImageIO dependencies
-* [imageio-core-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.6.4/imageio-core-3.6.4.jar)
-* [imageio-metadata-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.6.4/imageio-metadata-3.6.4.jar)
+* [imageio-core-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.8.0/imageio-core-3.8.0.jar)
+* [imageio-metadata-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.8.0/imageio-metadata-3.8.0.jar)
 
 ImageIO plugins
-* [imageio-bmp-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.6.4/imageio-bmp-3.6.4.jar)
-* [imageio-hdr-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.6.4/imageio-hdr-3.6.4.jar)
-* [imageio-icns-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.6.4/imageio-icns-3.6.4.jar)
-* [imageio-iff-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.6.4/imageio-iff-3.6.4.jar)
-* [imageio-jpeg-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.6.4/imageio-jpeg-3.6.4.jar)
-* [imageio-pcx-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.6.4/imageio-pcx-3.6.4.jar)
-* [imageio-pict-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.6.4/imageio-pict-3.6.4.jar)
-* [imageio-pnm-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.6.4/imageio-pnm-3.6.4.jar)
-* [imageio-psd-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.6.4/imageio-psd-3.6.4.jar)
-* [imageio-sgi-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.6.4/imageio-sgi-3.6.4.jar)
-* [imageio-tga-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.6.4/imageio-tga-3.6.4.jar)
-* [imageio-thumbsdb-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.6.4/imageio-thumbsdb-3.6.4.jar)
-* [imageio-tiff-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.6.4/imageio-tiff-3.6.4.jar)
+* [imageio-bmp-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.8.0/imageio-bmp-3.8.0.jar)
+* [imageio-hdr-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.8.0/imageio-hdr-3.8.0.jar)
+* [imageio-icns-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.8.0/imageio-icns-3.8.0.jar)
+* [imageio-iff-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.8.0/imageio-iff-3.8.0.jar)
+* [imageio-jpeg-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.8.0/imageio-jpeg-3.8.0.jar)
+* [imageio-pcx-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.8.0/imageio-pcx-3.8.0.jar)
+* [imageio-pict-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.8.0/imageio-pict-3.8.0.jar)
+* [imageio-pnm-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.8.0/imageio-pnm-3.8.0.jar)
+* [imageio-psd-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.8.0/imageio-psd-3.8.0.jar)
+* [imageio-sgi-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.8.0/imageio-sgi-3.8.0.jar)
+* [imageio-tga-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.8.0/imageio-tga-3.8.0.jar)
+* [imageio-thumbsdb-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.8.0/imageio-thumbsdb-3.8.0.jar)
+* [imageio-tiff-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.8.0/imageio-tiff-3.8.0.jar)
+* [imageio-webp-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-webp/3.8.0/imageio-webp-3.8.0.jar)
+* [imageio-xwd-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-xwd/3.8.0/imageio-xwd-3.8.0.jar)
 
 ImageIO plugins requiring 3rd party libs
-* [imageio-batik-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.6.4/imageio-batik-3.6.4.jar)
+* [imageio-batik-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.8.0/imageio-batik-3.8.0.jar)
 
 Photoshop Path support for ImageIO
-* [imageio-clippath-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.6.4/imageio-clippath-3.6.4.jar)
+* [imageio-clippath-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.8.0/imageio-clippath-3.8.0.jar)
 
 Servlet support
-* [servlet-3.6.4.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.6.4/servlet-3.6.4.jar)
+* [servlet-3.8.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.8.0/servlet-3.8.0.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 or later*.
 
 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)
+* [common-lang-3.0.2.jar](https://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](https://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](https://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-core-3.0.2.jar](https://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](https://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)
-* [imageio-psd-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.0.2/imageio-psd-3.0.2.jar)
-* [imageio-pict-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.0.2/imageio-pict-3.0.2.jar)
-* [imageio-iff-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.0.2/imageio-iff-3.0.2.jar)
-* [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-jpeg-3.0.2.jar](https://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](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.0.2/imageio-tiff-3.0.2.jar)
+* [imageio-psd-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.0.2/imageio-psd-3.0.2.jar)
+* [imageio-pict-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.0.2/imageio-pict-3.0.2.jar)
+* [imageio-iff-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.0.2/imageio-iff-3.0.2.jar)
+* [imageio-icns-3.0.2.jar](https://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](https://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](https://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)
+* [imageio-batik-3.0.2.jar](https://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](https://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)
+* [servlet-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.0.2/servlet-3.0.2.jar)
 
 
 ## License
 
-This project is provided under the OSI approved [BSD license](http://opensource.org/licenses/BSD-3-Clause):
+This project is provided under the OSI approved [BSD license](https://opensource.org/licenses/BSD-3-Clause):
 
     Copyright (c) 2008-2020, Harald Kuhr
     All rights reserved.
@@ -495,7 +504,7 @@ a: The TwelveMonkeys ImageIO project contains plug-ins for ImageIO. ImageIO uses
 
 All you have have to do, is to make sure you have the TwelveMonkeys JARs in your classpath.
 
-You can read more about the registry and the lookup mechanism in the [IIORegistry API doc](http://docs.oracle.com/javase/7/docs/api/javax/imageio/spi/IIORegistry.html).
+You can read more about the registry and the lookup mechanism in the [IIORegistry API doc](https://docs.oracle.com/javase/7/docs/api/javax/imageio/spi/IIORegistry.html).
 
 The fine print: The TwelveMonkeys service providers for JPEG, BMP and TIFF, overrides the onRegistration method, and
 utilizes the pairwise partial ordering mechanism of the `IIOServiceRegistry` to make sure it is installed before

bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
 
     <groupId>com.twelvemonkeys.bom</groupId>
@@ -123,6 +123,11 @@
                 <artifactId>imageio-tiff</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.twelvemonkeys.imageio</groupId>
+                <artifactId>imageio-webp</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.twelvemonkeys.imageio</groupId>
                 <artifactId>imageio-xwd</artifactId>

common/common-image/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>common-image</artifactId>
     <packaging>jar</packaging>

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

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

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

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

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

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

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

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

common/common-io/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>common-io</artifactId>
     <packaging>jar</packaging>

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

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

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

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

common/common-io/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java

@@ -29,6 +29,9 @@
 
 package com.twelvemonkeys.xml;
 
+import java.io.OutputStream;
+import java.io.Writer;
+
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMImplementationList;
 import org.w3c.dom.Document;
@@ -38,9 +41,6 @@ import org.w3c.dom.ls.DOMImplementationLS;
 import org.w3c.dom.ls.LSOutput;
 import org.w3c.dom.ls.LSSerializer;
 
-import java.io.OutputStream;
-import java.io.Writer;
-
 /**
  * {@code DOMImplementationLS} backed implementation.
  *
@@ -88,17 +88,6 @@ public final class DOMSerializer {
         output.setCharacterStream(pStream);
     }
 
-    /*
-    // TODO: Is it useful?
-    public void setNewLine(final String pNewLine) {
-        serializer.setNewLine(pNewLine);
-    }
-
-    public String getNewLine() {
-        return serializer.getNewLine();
-    }
-    */
-
     /**
      * Specifies wether the serializer should use indentation and optimize for
      * readability.
@@ -169,13 +158,7 @@ public final class DOMSerializer {
             try {
                 return DOMImplementationRegistry.newInstance();
             }
-            catch (ClassNotFoundException e) {
-                throw new IllegalStateException(e);
-            }
-            catch (InstantiationException e) {
-                throw new IllegalStateException(e);
-            }
-            catch (IllegalAccessException e) {
+            catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
                 throw new IllegalStateException(e);
             }
         }

common/common-io/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java

@@ -30,16 +30,23 @@
 
 package com.twelvemonkeys.xml;
 
-import com.twelvemonkeys.lang.StringUtil;
-import org.w3c.dom.*;
-import org.xml.sax.SAXException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
+import java.util.Date;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
-import java.nio.charset.Charset;
-import java.util.Date;
+
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+
+import com.twelvemonkeys.lang.StringUtil;
 
 /**
  * XMLSerializer
@@ -290,7 +297,7 @@ public class XMLSerializer {
     }
 
     private static int appendAndEscape(final String pString, int pStart, final int pEnd, final StringBuilder pBuilder, final String pEntity) {
-        pBuilder.append(pString.substring(pStart, pEnd));
+        pBuilder.append(pString, pStart, pEnd);
         pBuilder.append(pEntity);
         return pEnd + 1;
     }
@@ -527,8 +534,7 @@ public class XMLSerializer {
             builder = factory.newDocumentBuilder();
         }
         catch (ParserConfigurationException e) {
-            //noinspection ThrowableInstanceNeverThrown BOGUS
-            throw (IOException) new IOException(e.getMessage()).initCause(e);
+            throw new IOException(e);
         }
 
         DOMImplementation dom = builder.getDOMImplementation();

common/common-lang/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>common-lang</artifactId>
     <packaging>jar</packaging>

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

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

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

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

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

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

common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <groupId>com.twelvemonkeys.common</groupId>
     <artifactId>common</artifactId>

contrib/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <groupId>com.twelvemonkeys.contrib</groupId>
     <artifactId>contrib</artifactId>

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

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

imageio/imageio-batik/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-batik</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Batik Plugin</name>
@@ -48,6 +48,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-rasterizer-ext</artifactId>
@@ -68,13 +75,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>xmlgraphics-commons</artifactId>
-            <version>2.2</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-anim</artifactId>
@@ -98,7 +98,7 @@
             <!--
             There seems to be some weirdness in the
             Batik/FOP poms (Batik depends on FOP 0.20-5) that screws things up,
-            making everything end up depending on Batik 1.5, not 1.6
+            making everything end up depending on Batik 1.5, not the specified version
             -->
             <exclusions>
                 <exclusion>

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

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

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

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

imageio/imageio-bmp/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-bmp</artifactId>
     <name>TwelveMonkeys :: ImageIO :: BMP plugin</name>

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

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

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

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

imageio/imageio-clippath/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-clippath</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Photoshop Path Support</name>

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

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

imageio/imageio-core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-core</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Core</name>

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

@@ -0,0 +1,563 @@
+/*
+ * Copyright (c) 2021, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.color;
+
+import com.twelvemonkeys.io.FileUtil;
+import com.twelvemonkeys.lang.Platform;
+import com.twelvemonkeys.lang.SystemUtil;
+import com.twelvemonkeys.lang.Validate;
+
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_ColorSpace;
+import java.awt.color.ICC_Profile;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Properties;
+
+import static com.twelvemonkeys.imageio.color.ColorSpaces.DEBUG;
+
+/**
+ * A helper class for working with ICC color profiles.
+ * <p>
+ * Standard ICC color profiles are read from system-specific locations
+ * for known operating systems.
+ * </p>
+ * <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 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>,
+ * <a href="http://www.adobe.com/downloads/">Adobe</a> or other places.
+ * * </p>
+ * <p>
+ * Example property file:
+ * </p>
+ * <pre>
+ * # icc_profiles.properties
+ * ADOBE_RGB_1998=/path/to/Adobe RGB 1998.icc
+ * GENERIC_CMYK=/path/to/Generic CMYK.icc
+ * </pre>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: ColorSpaces.java,v 1.0 24.01.11 17.51 haraldk Exp$
+ */
+public final class ColorProfiles {
+    /**
+     * We need special ICC profile handling for KCMS vs LCMS. Delegate to specific strategy.
+     */
+    private final static ICCProfileSanitizer profileCleaner = ICCProfileSanitizer.Factory.get();
+
+    static final int ICC_PROFILE_MAGIC = 'a' << 24 | 'c' << 16 | 's' << 8 | 'p';
+    static final int ICC_PROFILE_HEADER_SIZE = 128;
+
+    static {
+        // In case we didn't activate through SPI already
+        ProfileDeferralActivator.activateProfiles();
+    }
+
+    private ColorProfiles() {
+    }
+
+    static byte[] getProfileHeaderWithProfileId(final ICC_Profile profile) {
+        // Get *entire profile data*... :-/
+        return getProfileHeaderWithProfileId(profile.getData());
+    }
+
+    static byte[] getProfileHeaderWithProfileId(byte[] data) {
+        // ICC profile header is the first 128 bytes
+        byte[] header = Arrays.copyOf(data, ICC_PROFILE_HEADER_SIZE);
+
+        // Clear out preferred CMM, platform & creator, as these don't affect the profile in any way
+        // - LCMS updates CMM + creator to "lcms" and platform to current platform
+        // - KCMS keeps the values in the file...
+        Arrays.fill(header, ICC_Profile.icHdrCmmId, ICC_Profile.icHdrCmmId + 4, (byte) 0);
+        Arrays.fill(header, ICC_Profile.icHdrPlatform, ICC_Profile.icHdrPlatform + 4, (byte) 0);
+        // + Clear out rendering intent, as this may be updated by application
+        Arrays.fill(header, ICC_Profile.icHdrRenderingIntent, ICC_Profile.icHdrRenderingIntent + 4, (byte) 0);
+        Arrays.fill(header, ICC_Profile.icHdrCreator, ICC_Profile.icHdrCreator + 4, (byte) 0);
+
+        // Clear out any existing MD5, as it is no longer correct
+        Arrays.fill(header, ICC_Profile.icHdrProfileID, ICC_Profile.icHdrProfileID + 16, (byte) 0);
+
+        // Generate new MD5 and store in header
+        byte[] md5 = computeMD5(header, data);
+        System.arraycopy(md5, 0, header, ICC_Profile.icHdrProfileID, md5.length);
+
+        return header;
+    }
+
+    private static byte[] computeMD5(byte[] header, byte[] data) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("MD5");
+            digest.update(header, 0, ICC_PROFILE_HEADER_SIZE);
+            digest.update(data, ICC_PROFILE_HEADER_SIZE, data.length - ICC_PROFILE_HEADER_SIZE);
+            return digest.digest();
+        }
+        catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException("Missing MD5 MessageDigest");
+        }
+    }
+
+    /**
+     * Tests whether an ICC color profile is equal to the default sRGB profile.
+     *
+     * @param profile the ICC profile to test. May not be {@code null}.
+     * @return {@code true} if {@code profile} is equal to the default sRGB profile.
+     * @throws IllegalArgumentException if {@code profile} is {@code null}
+     * @see java.awt.color.ColorSpace#CS_sRGB
+     * @see java.awt.color.ColorSpace#isCS_sRGB()
+     */
+    public static boolean isCS_sRGB(final ICC_Profile profile) {
+        Validate.notNull(profile, "profile");
+
+        return profile.getColorSpaceType() == ColorSpace.TYPE_RGB && Arrays.equals(getProfileHeaderWithProfileId(profile), sRGB.header);
+    }
+
+    /**
+     * Tests whether an ICC color profile is equal to the default GRAY profile.
+     *
+     * @param profile the ICC profile to test. May not be {@code null}.
+     * @return {@code true} if {@code profile} is equal to the default GRAY profile.
+     * @throws IllegalArgumentException if {@code profile} is {@code null}
+     * @see java.awt.color.ColorSpace#CS_GRAY
+     */
+    public static boolean isCS_GRAY(final ICC_Profile profile) {
+        Validate.notNull(profile, "profile");
+
+        return profile.getColorSpaceType() == ColorSpace.TYPE_GRAY && Arrays.equals(getProfileHeaderWithProfileId(profile), GRAY.header);
+    }
+
+    /**
+     * Tests whether an ICC color profile is known to cause problems for {@link java.awt.image.ColorConvertOp}.
+     * <p>
+     * <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>
+     * </p>
+     *
+     * @param profile the ICC color profile. May not be {@code null}.
+     * @return {@code true} if known to be offending, {@code false} otherwise
+     * @throws IllegalArgumentException if {@code profile} is {@code null}
+     */
+    static boolean isOffendingColorProfile(final ICC_Profile profile) {
+        Validate.notNull(profile, "profile");
+
+        // NOTE:
+        // Several embedded ICC color profiles are non-compliant with Java pre JDK7 and throws CMMException
+        // The problem with these embedded ICC profiles seems to be the rendering intent
+        // being 1 (01000000) - "Media Relative Colormetric" in the offending profiles,
+        // and 0 (00000000) - "Perceptual" in the good profiles
+        // (that is 1 single bit of difference right there.. ;-)
+        // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7064516
+
+        // This is particularly annoying, as the byte copying isn't really necessary,
+        // except the getRenderingIntent method is package protected in java.awt.color
+        byte[] header = profile.getData(ICC_Profile.icSigHead);
+
+        return header[ICC_Profile.icHdrRenderingIntent] != 0 || header[ICC_Profile.icHdrRenderingIntent + 1] != 0
+                || header[ICC_Profile.icHdrRenderingIntent + 2] != 0 || header[ICC_Profile.icHdrRenderingIntent + 3] > 3;
+    }
+
+    /**
+     * 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>
+     * </p>
+     *
+     * @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) {
+        // Fix profile before validation
+        profileCleaner.fixProfile(profile);
+        ColorSpaces.validateColorSpace(new ICC_ColorSpace(profile)); // TODO: Should use createColorSpace and cache if good?
+
+        return profile;
+    }
+
+    /**
+     * Reads an ICC Profile from the given input stream, as-is, with no validation.
+     *
+     * This method behaves exactly like {@code ICC_Profile.getInstance(input)}.
+     *
+     * @param input the input stream to read from, may not be {@code null}
+     * @return an {@code ICC_Profile} object as read from the input stream.
+     * @throws IOException              If an I/O error occurs while reading the stream.
+     * @throws IllegalArgumentException If {@code input} is {@code null}
+     *                                  or the stream does not contain valid ICC Profile data.
+     * @see ICC_Profile#getInstance(InputStream)
+     * @see #readProfile(InputStream)
+     */
+    public static ICC_Profile readProfileRaw(final InputStream input) throws IOException {
+        Validate.notNull(input, "input");
+
+        return ICC_Profile.getInstance(input);
+    }
+
+    /**
+     * Reads an ICC Profile from the given input stream, with extra validation.
+     *
+     * If a matching profile already exists in cache, the cached instance is returned.
+     *
+     * @param input the input stream to read from, may not be {@code null}
+     * @return an {@code ICC_Profile} object as read from the input stream.
+     * @throws IOException              If an I/O error occurs while reading the stream.
+     * @throws IllegalArgumentException If {@code input} is {@code null}
+     *                                  or the stream does not contain valid ICC Profile data.
+     * @see ICC_Profile#getInstance(InputStream)
+     */
+    public static ICC_Profile readProfile(final InputStream input) throws IOException {
+        Validate.notNull(input, "input");
+
+        DataInputStream dataInput = new DataInputStream(input);
+        byte[] header = new byte[ICC_PROFILE_HEADER_SIZE];
+        try {
+            dataInput.readFully(header);
+
+            int size = validateHeaderAndGetSize(header);
+            byte[] data = Arrays.copyOf(header, size);
+            dataInput.readFully(data, header.length, size - header.length);
+
+            return createProfile(data);
+        }
+        catch (EOFException e) {
+            throw new IllegalArgumentException("Truncated ICC Profile data", e);
+        }
+    }
+
+    /**
+     * Creates an ICC Profile from the given byte array, as-is, with no validation.
+     *
+     * This method behaves exactly like {@code ICC_Profile.getInstance(input)},
+     * except that extraneous bytes at the end of the array is ignored.
+     *
+     * @param input the byte array to create a profile from, may not be {@code null}
+     * @return an {@code ICC_Profile} object created from the byte array
+     * @throws IllegalArgumentException If {@code input} is {@code null}
+     *                                  or the byte array does not contain valid ICC Profile data.
+     * @see ICC_Profile#getInstance(byte[])
+     * @see #createProfile(byte[])
+     */
+    public static ICC_Profile createProfileRaw(final byte[] input) {
+        int size = validateHeaderAndGetSize(input);
+
+        // Unlike the InputStream version, the byte version of ICC_Profile.getInstance()
+        // does not discard extra bytes at the end. We'll chop them off here for convenience
+        return ICC_Profile.getInstance(limit(input, size));
+    }
+
+    /**
+     * Reads an ICC Profile from the given byte array, with extra validation.
+     * Extraneous bytes at the end of the array are ignored.
+     *
+     * If a matching profile already exists in cache, the cached instance is returned.
+     *
+     * @param input the byte array to create a profile from, may not be {@code null}
+     * @return an {@code ICC_Profile} object created from the byte array
+     * @throws IllegalArgumentException If {@code input} is {@code null}
+     *                                  or the byte array does not contain valid ICC Profile data.
+     * @see ICC_Profile#getInstance(byte[])
+     */
+    public static ICC_Profile createProfile(final byte[] input) {
+        int size = validateAndGetSize(input);
+
+        // Look up in cache before returning, these are already validated
+        byte[] profileHeader = getProfileHeaderWithProfileId(input);
+        ICC_Profile internal = getInternalProfile(profileHeader);
+        if (internal != null) {
+            return internal;
+        }
+
+        ICC_ColorSpace cached = ColorSpaces.getCachedCS(profileHeader);
+        if (cached != null) {
+            return cached.getProfile();
+        }
+
+        ICC_Profile profile = ICC_Profile.getInstance(limit(input, size));
+
+        // We'll validate & cache by creating a color space and returning its profile...
+        // TODO: Rewrite with separate cache for profiles...
+        return ColorSpaces.createColorSpace(profile).getProfile();
+    }
+
+    private static byte[] limit(byte[] input, int size) {
+        return input.length == size ? input : Arrays.copyOf(input, size);
+    }
+
+    private static int validateAndGetSize(byte[] input) {
+        int size = validateHeaderAndGetSize(input);
+
+        if (size < 0 || size > input.length) {
+            throw new IllegalArgumentException("Truncated ICC profile data, length < " + size + ": " + input.length);
+        }
+
+        return size;
+    }
+
+    private static int validateHeaderAndGetSize(byte[] input) {
+        Validate.notNull(input, "input");
+
+        if (input.length < ICC_PROFILE_HEADER_SIZE) { // Can't be less than size of ICC header
+            throw new IllegalArgumentException("Truncated ICC profile data, length < 128: " + input.length);
+        }
+
+        int size = intBigEndian(input, ICC_Profile.icHdrSize);
+
+        if (intBigEndian(input, ICC_Profile.icHdrMagic) != ICC_PROFILE_MAGIC) {
+            throw new IllegalArgumentException("Not an ICC profile, missing file signature");
+        }
+
+        return size;
+    }
+
+    private static ICC_Profile getInternalProfile(final byte[] profileHeader) {
+        int profileCSType = getCsType(profileHeader);
+
+        if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.sRGB.header)) {
+            return ICC_Profile.getInstance(ColorSpace.CS_sRGB);
+        }
+        else if (profileCSType == ColorSpace.TYPE_GRAY && Arrays.equals(profileHeader, ColorProfiles.GRAY.header)) {
+            return ICC_Profile.getInstance(ColorSpace.CS_GRAY);
+        }
+        else if (profileCSType == ColorSpace.TYPE_3CLR && Arrays.equals(profileHeader, ColorProfiles.PYCC.header)) {
+            return ICC_Profile.getInstance(ColorSpace.CS_PYCC);
+        }
+        else if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.LINEAR_RGB.header)) {
+            return ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB);
+        }
+        else if (profileCSType == ColorSpace.TYPE_XYZ && Arrays.equals(profileHeader, ColorProfiles.CIEXYZ.header)) {
+            return ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ);
+        }
+
+        return null;
+    }
+
+    private static int intBigEndian(byte[] data, int index) {
+        return (data[index] & 0xff) << 24 | (data[index + 1] & 0xff) << 16 | (data[index + 2] & 0xff) << 8 | (data[index + 3] & 0xff);
+    }
+
+    private static int getCsType(byte[] profileHeader) {
+        int csSig = intBigEndian(profileHeader, ICC_Profile.icHdrColorSpace);
+
+        switch (csSig) {
+            case ICC_Profile.icSigXYZData:
+                return ColorSpace.TYPE_XYZ;
+            case ICC_Profile.icSigLabData:
+                return ColorSpace.TYPE_Lab;
+            case ICC_Profile.icSigLuvData:
+                return ColorSpace.TYPE_Luv;
+            case ICC_Profile.icSigYCbCrData:
+                return ColorSpace.TYPE_YCbCr;
+            case ICC_Profile.icSigYxyData:
+                return ColorSpace.TYPE_Yxy;
+            case ICC_Profile.icSigRgbData:
+                return ColorSpace.TYPE_RGB;
+            case ICC_Profile.icSigGrayData:
+                return ColorSpace.TYPE_GRAY;
+            case ICC_Profile.icSigHsvData:
+                return ColorSpace.TYPE_HSV;
+            case ICC_Profile.icSigHlsData:
+                return ColorSpace.TYPE_HLS;
+            case ICC_Profile.icSigCmykData:
+                return ColorSpace.TYPE_CMYK;
+            // Note: There is no TYPE_* 10...
+            case ICC_Profile.icSigCmyData:
+                return ColorSpace.TYPE_CMY;
+            case ICC_Profile.icSigSpace2CLR:
+                return ColorSpace.TYPE_2CLR;
+            case ICC_Profile.icSigSpace3CLR:
+                return ColorSpace.TYPE_3CLR;
+            case ICC_Profile.icSigSpace4CLR:
+                return ColorSpace.TYPE_4CLR;
+            case ICC_Profile.icSigSpace5CLR:
+                return ColorSpace.TYPE_5CLR;
+            case ICC_Profile.icSigSpace6CLR:
+                return ColorSpace.TYPE_6CLR;
+            case ICC_Profile.icSigSpace7CLR:
+                return ColorSpace.TYPE_7CLR;
+            case ICC_Profile.icSigSpace8CLR:
+                return ColorSpace.TYPE_8CLR;
+            case ICC_Profile.icSigSpace9CLR:
+                return ColorSpace.TYPE_9CLR;
+            case ICC_Profile.icSigSpaceACLR:
+                return ColorSpace.TYPE_ACLR;
+            case ICC_Profile.icSigSpaceBCLR:
+                return ColorSpace.TYPE_BCLR;
+            case ICC_Profile.icSigSpaceCCLR:
+                return ColorSpace.TYPE_CCLR;
+            case ICC_Profile.icSigSpaceDCLR:
+                return ColorSpace.TYPE_DCLR;
+            case ICC_Profile.icSigSpaceECLR:
+                return ColorSpace.TYPE_ECLR;
+            case ICC_Profile.icSigSpaceFCLR:
+                return ColorSpace.TYPE_FCLR;
+            default:
+                throw new IllegalArgumentException("Invalid ICC color space signature: " + csSig); // TODO: fourCC?
+        }
+    }
+
+    static ICC_Profile readProfileFromClasspathResource(@SuppressWarnings("SameParameterValue") final String profilePath) {
+        InputStream stream = ColorSpaces.class.getResourceAsStream(profilePath);
+
+        if (stream != null) {
+            if (DEBUG) {
+                System.out.println("Loading profile from classpath resource: " + profilePath);
+            }
+
+            try {
+                return ICC_Profile.getInstance(stream);
+            }
+            catch (@SuppressWarnings("CatchMayIgnoreException") IOException ignore) {
+                if (DEBUG) {
+                    ignore.printStackTrace();
+                }
+            }
+            finally {
+                FileUtil.close(stream);
+            }
+        }
+
+        return null;
+    }
+
+    static ICC_Profile readProfileFromPath(final String profilePath) {
+        if (profilePath != null) {
+            if (DEBUG) {
+                System.out.println("Loading profile from: " + profilePath);
+            }
+
+            try {
+                return ICC_Profile.getInstance(profilePath);
+            }
+            catch (@SuppressWarnings("CatchMayIgnoreException") SecurityException | IOException ignore) {
+                if (DEBUG) {
+                    ignore.printStackTrace();
+                }
+            }
+        }
+
+        return null;
+    }
+
+    static void fixProfile(ICC_Profile profile) {
+        profileCleaner.fixProfile(profile);
+    }
+
+    static boolean validationAltersProfileHeader() {
+        return profileCleaner.validationAltersProfileHeader();
+    }
+
+    // Cache header profile data to avoid excessive array creation/copying. Use static inner class for on-demand lazy init
+    static class sRGB {
+        static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_sRGB));
+    }
+
+    static class CIEXYZ {
+        static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ));
+    }
+
+    static class PYCC {
+        static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_PYCC));
+    }
+
+    static class GRAY {
+        static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_GRAY));
+    }
+
+    static class LINEAR_RGB {
+        static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB));
+    }
+
+    static class Profiles {
+        // TODO: Honour java.iccprofile.path property?
+        private static final Properties PROFILES = loadProfiles();
+
+        private static Properties loadProfiles() {
+            Properties systemDefaults;
+
+            try {
+                systemDefaults = SystemUtil.loadProperties(ColorSpaces.class, "com/twelvemonkeys/imageio/color/icc_profiles_" + Platform.os().id());
+            }
+            catch (@SuppressWarnings("CatchMayIgnoreException") SecurityException | IOException ignore) {
+                System.err.printf(
+                        "Warning: Could not load system default ICC profile locations from %s, will use bundled fallback profiles.\n",
+                        ignore.getMessage()
+                );
+
+                if (DEBUG) {
+                    ignore.printStackTrace();
+                }
+
+                systemDefaults = null;
+            }
+
+            // Create map with defaults and add user overrides if any
+            Properties profiles = new Properties(systemDefaults);
+
+            try {
+                Properties userOverrides = SystemUtil.loadProperties(
+                        ColorSpaces.class,
+                        "com/twelvemonkeys/imageio/color/icc_profiles"
+                );
+                profiles.putAll(userOverrides);
+            }
+            catch (SecurityException | IOException ignore) {
+                // Most likely, this file won't be there
+            }
+
+            if (DEBUG) {
+                System.out.println("User ICC profiles: " + profiles);
+                System.out.println("System ICC profiles : " + systemDefaults);
+            }
+
+            return profiles;
+        }
+
+        static String getPath(final String profileName) {
+            return PROFILES.getProperty(profileName);
+        }
+    }
+}

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

@@ -30,23 +30,17 @@
 
 package com.twelvemonkeys.imageio.color;
 
-import com.twelvemonkeys.io.FileUtil;
-import com.twelvemonkeys.lang.Platform;
-import com.twelvemonkeys.lang.SystemUtil;
 import com.twelvemonkeys.lang.Validate;
 import com.twelvemonkeys.util.LRUHashMap;
 
 import java.awt.color.ColorSpace;
 import java.awt.color.ICC_ColorSpace;
 import java.awt.color.ICC_Profile;
-import java.io.IOException;
-import java.io.InputStream;
 import java.lang.ref.WeakReference;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Map;
-import java.util.Properties;
+
+import static com.twelvemonkeys.imageio.color.ColorProfiles.*;
 
 /**
  * A helper class for working with ICC color profiles and color spaces.
@@ -83,9 +77,6 @@ public final class ColorSpaces {
 
     final static boolean DEBUG = "true".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.imageio.color.debug"));
 
-    /** We need special ICC profile handling for KCMS vs LCMS. Delegate to specific strategy. */
-    private final static ICCProfileSanitizer profileCleaner = ICCProfileSanitizer.Factory.get();
-
     // NOTE: java.awt.color.ColorSpace.CS_* uses 1000-1004, we'll use 5000+ to not interfere with future additions
 
     /** The Adobe RGB 1998 (or compatible) color space. Either read from disk or built-in. */
@@ -96,24 +87,17 @@ public final class ColorSpaces {
     @SuppressWarnings("WeakerAccess")
     public static final int CS_GENERIC_CMYK = 5001;
 
+    // TODO: Move to ColorProfiles OR cache ICC_ColorSpace instead?
     // Weak references to hold the color spaces while cached
     private static WeakReference<ICC_Profile> adobeRGB1998 = new WeakReference<>(null);
     private static WeakReference<ICC_Profile> genericCMYK = new WeakReference<>(null);
 
     // Cache for the latest used color spaces
-    private static final Map<Key, ICC_ColorSpace> cache = new LRUHashMap<>(10);
+    private static final Map<Key, ICC_ColorSpace> cache = new LRUHashMap<>(16);
 
     static {
-        try {
-            // Force invocation of ProfileDeferralMgr.activateProfiles() to avoid JDK-6986863
-            ICC_Profile.getInstance(ColorSpace.CS_sRGB).getData();
-        }
-        catch (Throwable disasters) {
-            System.err.println("ICC Color Profile not properly activated due to the exception below.");
-            System.err.println("Expect to see JDK-6986863 in action, and consider filing a bug report to your JRE provider.");
-
-            disasters.printStackTrace();
-        }
+        // In case we didn't activate through SPI already
+        ProfileDeferralActivator.activateProfiles();
     }
 
     private ColorSpaces() {}
@@ -134,7 +118,7 @@ public final class ColorSpaces {
         Validate.notNull(profile, "profile");
 
         // Fix profile before lookup/create
-        profileCleaner.fixProfile(profile);
+        fixProfile(profile);
 
         byte[] profileHeader = getProfileHeaderWithProfileId(profile);
 
@@ -146,53 +130,20 @@ public final class ColorSpaces {
         return getCachedOrCreateCS(profile, profileHeader);
     }
 
-    private static byte[] getProfileHeaderWithProfileId(final ICC_Profile profile) {
-        // Get *entire profile data*... :-/
-        byte[] data = profile.getData();
-
-        // Clear out preferred CMM, platform & creator, as these does not affect the profile in any way
-        // - LCMS updates CMM + creator to "lcms" and platform to current platform
-        // - KCMS keeps the values in the file...
-        Arrays.fill(data, ICC_Profile.icHdrCmmId, ICC_Profile.icHdrCmmId + 4, (byte) 0);
-        Arrays.fill(data, ICC_Profile.icHdrPlatform, ICC_Profile.icHdrPlatform + 4, (byte) 0);
-        // + Clear out rendering intent, as this may be updated by application
-        Arrays.fill(data, ICC_Profile.icHdrRenderingIntent, ICC_Profile.icHdrRenderingIntent + 4, (byte) 0);
-        Arrays.fill(data, ICC_Profile.icHdrCreator, ICC_Profile.icHdrCreator + 4, (byte) 0);
-
-        // Clear out any existing MD5, as it is no longer correct
-        Arrays.fill(data, ICC_Profile.icHdrProfileID, ICC_Profile.icHdrProfileID + 16, (byte) 0);
-
-        // Generate new MD5 and store in header
-        byte[] md5 = computeMD5(data);
-        System.arraycopy(md5, 0, data, ICC_Profile.icHdrProfileID, md5.length);
-
-        // ICC profile header is the first 128 bytes
-        return Arrays.copyOf(data, 128);
-    }
-
-    private static byte[] computeMD5(byte[] data) {
-        try {
-            return MessageDigest.getInstance("MD5").digest(data);
-        }
-        catch (NoSuchAlgorithmException e) {
-            throw new IllegalStateException("Missing MD5 MessageDigest");
-        }
-    }
-
-    private static ICC_ColorSpace getInternalCS(final int profileCSType, final byte[] profileHeader) {
-        if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, sRGB.header)) {
+    static ICC_ColorSpace getInternalCS(final int profileCSType, final byte[] profileHeader) {
+        if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.sRGB.header)) {
             return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_sRGB);
         }
-        else if (profileCSType == ColorSpace.TYPE_GRAY && Arrays.equals(profileHeader, GRAY.header)) {
+        else if (profileCSType == ColorSpace.TYPE_GRAY && Arrays.equals(profileHeader, ColorProfiles.GRAY.header)) {
             return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_GRAY);
         }
-        else if (profileCSType == ColorSpace.TYPE_3CLR && Arrays.equals(profileHeader, PYCC.header)) {
+        else if (profileCSType == ColorSpace.TYPE_3CLR && Arrays.equals(profileHeader, ColorProfiles.PYCC.header)) {
             return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_PYCC);
         }
-        else if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, LINEAR_RGB.header)) {
+        else if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.LINEAR_RGB.header)) {
             return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB);
         }
-        else if (profileCSType == ColorSpace.TYPE_XYZ && Arrays.equals(profileHeader, CIEXYZ.header)) {
+        else if (profileCSType == ColorSpace.TYPE_XYZ && Arrays.equals(profileHeader, ColorProfiles.CIEXYZ.header)) {
             return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_CIEXYZ);
         }
 
@@ -203,26 +154,36 @@ public final class ColorSpaces {
         Key key = new Key(profileHeader);
 
         synchronized (cache) {
-            ICC_ColorSpace cs = cache.get(key);
+            ICC_ColorSpace cs = getCachedCS(key);
 
             if (cs == null) {
                 cs = new ICC_ColorSpace(profile);
 
                 validateColorSpace(cs);
 
-                // On LCMS, validation *alters* the profile header, need to re-generate key
-                key = profileCleaner.validationAltersProfileHeader()
-                      ? new Key(getProfileHeaderWithProfileId(cs.getProfile()))
-                      : key;
-
                 cache.put(key, cs);
+
+                // On LCMS, validation *alters* the profile header, need to re-generate key
+                if (ColorProfiles.validationAltersProfileHeader()) {
+                    cache.put(new Key(getProfileHeaderWithProfileId(cs.getProfile())), cs);
+                }
             }
 
             return cs;
         }
     }
 
-    private static void validateColorSpace(final ICC_ColorSpace cs) {
+    private static ICC_ColorSpace getCachedCS(Key profileKey) {
+        synchronized (cache) {
+            return cache.get(profileKey);
+        }
+    }
+
+    static ICC_ColorSpace getCachedCS(final byte[] profileHeader) {
+        return getCachedCS(new Key(profileHeader));
+    }
+
+    static void validateColorSpace(final ICC_ColorSpace cs) {
         // Validate the color space, to avoid caching bad profiles/color spaces
         // Will throw IllegalArgumentException or CMMException if the profile is bad
         cs.fromRGB(new float[] {0.999f, 0.5f, 0.001f});
@@ -233,73 +194,27 @@ public final class ColorSpaces {
     }
 
     /**
-     * Tests whether an ICC color profile is equal to the default sRGB profile.
-     *
-     * @param profile the ICC profile to test. May not be {@code null}.
-     * @return {@code true} if {@code profile} is equal to the default sRGB profile.
-     * @throws IllegalArgumentException if {@code profile} is {@code null}
-     *
-     * @see java.awt.color.ColorSpace#isCS_sRGB()
+     * @deprecated Use {@link ColorProfiles#isCS_sRGB(ICC_Profile)} instead.
      */
+    @Deprecated
     public static boolean isCS_sRGB(final ICC_Profile profile) {
-        Validate.notNull(profile, "profile");
-
-        return profile.getColorSpaceType() == ColorSpace.TYPE_RGB && Arrays.equals(getProfileHeaderWithProfileId(profile), sRGB.header);
+        return ColorProfiles.isCS_sRGB(profile);
     }
 
     /**
-     * Tests whether an ICC color profile is 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>
-     * </p>
-     *
-     * @param profile the ICC color profile. May not be {@code null}.
-     * @return {@code true} if known to be offending, {@code false} otherwise
-     * @throws IllegalArgumentException if {@code profile} is {@code null}
+     * @deprecated Use {@link ColorProfiles#isCS_GRAY(ICC_Profile)} instead.
      */
-    static boolean isOffendingColorProfile(final ICC_Profile profile) {
-        Validate.notNull(profile, "profile");
-
-        // NOTE:
-        // Several embedded ICC color profiles are non-compliant with Java pre JDK7 and throws CMMException
-        // The problem with these embedded ICC profiles seems to be the rendering intent
-        // being 1 (01000000) - "Media Relative Colormetric" in the offending profiles,
-        // and 0 (00000000) - "Perceptual" in the good profiles
-        // (that is 1 single bit of difference right there.. ;-)
-        // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7064516
-
-        // This is particularly annoying, as the byte copying isn't really necessary,
-        // except the getRenderingIntent method is package protected in java.awt.color
-        byte[] header = profile.getData(ICC_Profile.icSigHead);
-
-        return header[ICC_Profile.icHdrRenderingIntent] != 0 || header[ICC_Profile.icHdrRenderingIntent + 1] != 0
-                || header[ICC_Profile.icHdrRenderingIntent + 2] != 0 || header[ICC_Profile.icHdrRenderingIntent + 3] > 3;
+    @Deprecated
+    public static boolean isCS_GRAY(final ICC_Profile profile) {
+        return ColorProfiles.isCS_GRAY(profile);
     }
 
     /**
-     * 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>
-     * </p>
-     *
-     * @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.
+     * @deprecated Use {@link ColorProfiles#validateProfile(ICC_Profile)} instead.
      */
+    @Deprecated
     public static ICC_Profile validateProfile(final ICC_Profile profile) {
-        // Fix profile before validation
-        profileCleaner.fixProfile(profile);
-        validateColorSpace(new ICC_ColorSpace(profile));
-
-        return profile;
+        return ColorProfiles.validateProfile(profile);
     }
 
     /**
@@ -382,50 +297,6 @@ public final class ColorSpaces {
         }
     }
 
-    @SuppressWarnings("SameParameterValue")
-    private static ICC_Profile readProfileFromClasspathResource(final String profilePath) {
-        InputStream stream = ColorSpaces.class.getResourceAsStream(profilePath);
-
-        if (stream != null) {
-            if (DEBUG) {
-                System.out.println("Loading profile from classpath resource: " + profilePath);
-            }
-
-            try {
-                return ICC_Profile.getInstance(stream);
-            }
-            catch (IOException ignore) {
-                if (DEBUG) {
-                    ignore.printStackTrace();
-                }
-            }
-            finally {
-                FileUtil.close(stream);
-            }
-        }
-
-        return null;
-    }
-
-    private static ICC_Profile readProfileFromPath(final String profilePath) {
-        if (profilePath != null) {
-            if (DEBUG) {
-                System.out.println("Loading profile from: " + profilePath);
-            }
-
-            try {
-                return ICC_Profile.getInstance(profilePath);
-            }
-            catch (SecurityException | IOException ignore) {
-                if (DEBUG) {
-                    ignore.printStackTrace();
-                }
-            }
-        }
-
-        return null;
-    }
-
     private static final class Key {
         private final byte[] data;
 
@@ -448,78 +319,4 @@ public final class ColorSpaces {
             return getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
         }
     }
-
-    // Cache header profile data to avoid excessive array creation/copying in static inner class for on-demand lazy init
-    private static class sRGB {
-        private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_sRGB));
-    }
-
-    private static class CIEXYZ {
-        private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ));
-    }
-
-    private static class PYCC {
-        private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_PYCC));
-    }
-
-    private static class GRAY {
-        private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_GRAY));
-    }
-
-    private static class LINEAR_RGB {
-        private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB));
-    }
-
-    private static class Profiles {
-        // TODO: Honour java.iccprofile.path property?
-        private static final Properties PROFILES = loadProfiles();
-
-        private static Properties loadProfiles() {
-            Properties systemDefaults;
-
-            try {
-                systemDefaults = SystemUtil.loadProperties(
-                        ColorSpaces.class,
-                        "com/twelvemonkeys/imageio/color/icc_profiles_" + Platform.os().id()
-                );
-            }
-            catch (SecurityException | IOException ignore) {
-                System.err.printf(
-                        "Warning: Could not load system default ICC profile locations from %s, will use bundled fallback profiles.\n",
-                        ignore.getMessage()
-                );
-
-                if (DEBUG) {
-                    ignore.printStackTrace();
-                }
-
-                systemDefaults = null;
-            }
-
-            // Create map with defaults and add user overrides if any
-            Properties profiles = new Properties(systemDefaults);
-
-            try {
-                Properties userOverrides = SystemUtil.loadProperties(
-                        ColorSpaces.class,
-                        "com/twelvemonkeys/imageio/color/icc_profiles"
-                );
-                profiles.putAll(userOverrides);
-            }
-            catch (SecurityException | IOException ignore) {
-                // Most likely, this file won't be there
-            }
-
-            if (DEBUG) {
-                System.out.println("User ICC profiles: " + profiles);
-                System.out.println("System ICC profiles : " + systemDefaults);
-            }
-
-            return profiles;
-        }
-
-        static String getPath(final String profileName) {
-            return PROFILES.getProperty(profileName);
-        }
-    }
 }

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2021, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.color;
+
+import javax.imageio.spi.ImageInputStreamSpi;
+import javax.imageio.spi.ServiceRegistry;
+import javax.imageio.stream.ImageInputStream;
+import java.io.File;
+import java.util.Locale;
+
+import static com.twelvemonkeys.imageio.util.IIOUtil.deregisterProvider;
+
+/**
+ * This class exists to force early invocation of {@code ProfileDeferralMgr.activateProfiles()},
+ * in an attempt to avoid JDK-6986863 and related bugs in Java < 17.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @see <a href="https://bugs.openjdk.java.net/browse/JDK-6986863">JDK-6986863</a>
+ */
+final class ProfileDeferralActivator {
+
+    static {
+        activateProfilesInternal();
+    }
+
+    private static void activateProfilesInternal() {
+        try {
+            // Force invocation of ProfileDeferralMgr.activateProfiles() to avoid JDK-6986863 and friends.
+            // Relies on static initializer in ColorConvertOp to actually invoke ProfileDeferralMgr.activateProfiles()
+            Class.forName("java.awt.image.ColorConvertOp");
+        }
+        catch (Throwable disasters) {
+            System.err.println("ProfileDeferralMgr.activateProfiles() failed. ICC Color Profiles may not work properly, see stack trace below.");
+            System.err.println("For more information, see https://bugs.openjdk.java.net/browse/JDK-6986863");
+            System.err.println("Please upgrade to Java 17 or later where this bug is fixed, or ask your JRE provider to backport the fix.");
+            System.err.println();
+            System.err.println("If you can't update to Java 17, a possible workaround is to add");
+            System.err.println("\tClass.forName(\"java.awt.image.ColorConvertOp\");");
+            System.err.println("*early* in your application startup code, to force profile activation before profiles are accessed.");
+            System.err.println();
+
+            disasters.printStackTrace();
+        }
+    }
+
+    static void activateProfiles() {
+        // This method exists for other classes in the package to
+        // ensure this class' static initializer is run.
+    }
+
+    /**
+     * This is not a service provider, but exploits the SPI mechanism as a hook to force early profile activation.
+     */
+    public static final class Spi extends ImageInputStreamSpi {
+        @Override public void onRegistration(ServiceRegistry registry, Class<?> category) {
+            activateProfiles();
+
+            deregisterProvider(registry, this, category);
+        }
+
+        @Override public String getDescription(Locale locale) {
+            return getClass().getName();
+        }
+
+        @Override public ImageInputStream createInputStreamInstance(Object input, boolean useCache, File cacheDir) {
+            throw new UnsupportedOperationException();
+        }
+    }
+}

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

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

imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedFileImageInputStream.java

@@ -93,8 +93,8 @@ public final class BufferedFileImageInputStream extends ImageInputStreamImpl {
 
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean fillBuffer() throws IOException {
-        bufferPos = 0;
         int length = raf.read(buffer, 0, buffer.length);
+        bufferPos = 0;
         bufferLimit = max(length, 0);
 
         return bufferLimit > 0;
@@ -125,27 +125,35 @@ public final class BufferedFileImageInputStream extends ImageInputStreamImpl {
     }
 
     @Override
-    public int read(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
+    public int read(final byte[] bytes, final int offset, final int length) throws IOException {
         checkClosed();
         bitOffset = 0;
 
         if (bufferEmpty()) {
             // Bypass buffer if buffer is empty for reads longer than buffer
-            if (pLength >= buffer.length) {
-                return readDirect(pBuffer, pOffset, pLength);
+            if (length >= buffer.length) {
+                return readDirect(bytes, offset, length);
             }
             else if (!fillBuffer()) {
                 return -1;
             }
         }
 
-        return readBuffered(pBuffer, pOffset, pLength);
+        int fromBuffer = readBuffered(bytes, offset, length);
+
+        if (length > fromBuffer) {
+            // Due to known bugs in certain JDK-bundled ImageIO plugins expecting read to behave as readFully,
+            // we'll read as much as possible from the buffer, and the rest directly after
+            return fromBuffer + max(0, readDirect(bytes, offset + fromBuffer, length - fromBuffer));
+        }
+
+        return fromBuffer;
     }
 
-    private int readDirect(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
+    private int readDirect(final byte[] bytes, final int offset, final int length) throws IOException {
         // Invalidate the buffer, as its contents is no longer in sync with the stream's position.
         bufferLimit = 0;
-        int read = raf.read(pBuffer, pOffset, pLength);
+        int read = raf.read(bytes, offset, length);
 
         if (read > 0) {
             streamPos += read;
@@ -154,17 +162,17 @@ public final class BufferedFileImageInputStream extends ImageInputStreamImpl {
         return read;
     }
 
-    private int readBuffered(final byte[] pBuffer, final int pOffset, final int pLength) {
+    private int readBuffered(final byte[] bytes, final int offset, final int length) {
         // Read as much as possible from buffer
-        int length = Math.min(bufferLimit - bufferPos, pLength);
+        int available = Math.min(bufferLimit - bufferPos, length);
 
-        if (length > 0) {
-            System.arraycopy(buffer, bufferPos, pBuffer, pOffset, length);
-            bufferPos += length;
-            streamPos += length;
+        if (available > 0) {
+            System.arraycopy(buffer, bufferPos, bytes, offset, available);
+            bufferPos += available;
+            streamPos += available;
         }
 
-        return length;
+        return available;
     }
 
     public long length() {
@@ -237,7 +245,7 @@ public final class BufferedFileImageInputStream extends ImageInputStreamImpl {
 
         // Optimized to not invalidate buffer if new position is within current buffer
         long newBufferPos = bufferPos + position - streamPos;
-        if (newBufferPos >= 0 && newBufferPos <= bufferLimit) {
+        if (newBufferPos >= 0 && newBufferPos < bufferLimit) {
             bufferPos = (int) newBufferPos;
         }
         else {

imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java

@@ -45,6 +45,7 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -158,33 +159,39 @@ public final class IIOUtil {
     }
 
     /**
-     * THIS METHOD WILL ME MOVED/RENAMED, DO NOT USE.
+     * THIS METHOD WILL BE MOVED/RENAMED, DO NOT USE.
      *
      * @param registry the registry to unregister from.
      * @param provider the provider to unregister.
      * @param category the category to unregister from.
      */
     public static <T> void deregisterProvider(final ServiceRegistry registry, final IIOServiceProvider provider, final Class<T> category) {
-        // http://www.ibm.com/developerworks/java/library/j-jtp04298.html
         registry.deregisterServiceProvider(category.cast(provider), category);
     }
 
     /**
-     * THIS METHOD WILL ME MOVED/RENAMED, DO NOT USE.
+     * THIS METHOD WILL BE MOVED/RENAMED, DO NOT USE.
      *
      * @param registry the registry to lookup from.
      * @param providerClassName name of the provider class.
      * @param category provider category
      *
-     * @return the provider instance, or {@code null}.
+     * @return the provider instance, or {@code null} if not found
      */
     public static <T> T lookupProviderByName(final ServiceRegistry registry, final String providerClassName, Class<T> category) {
-        try {
-            return category.cast(registry.getServiceProviderByClass(Class.forName(providerClassName)));
-        }
-        catch (ClassNotFoundException ignore) {
-            return null;
+        // NOTE: While more verbose, this is more OSGi-friendly than using
+        // registry.getServiceProviderByClass(Class.forName(providerClassName))
+        Iterator<T> providers = registry.getServiceProviders(category, true);
+
+        while (providers.hasNext()) {
+            T provider = providers.next();
+
+            if (provider.getClass().getName().equals(providerClassName)) {
+                return provider;
+            }
         }
+
+        return null;
     }
 
     /**

imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/RasterUtils.java

@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2021, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.util;
+
+import java.awt.*;
+import java.awt.image.*;
+
+import static com.twelvemonkeys.lang.Validate.notNull;
+
+/**
+ * A class containing various raster utility methods.
+ */
+public final class RasterUtils {
+
+    private RasterUtils() {
+    }
+
+    /**
+     * Returns a raster with {@code DataBuffer.TYPE_BYTE} transfer type.
+     * Works for any raster from a {@code BufferedImage.TYPE_INT_*} image
+     *
+     * @param raster a {@code Raster} with either transfer type {@code DataBuffer.TYPE_BYTE}
+     *               or {@code DataBuffer.TYPE_INT} with `SinglePixelPackedSampleModel`, not {@code null}.
+     * @return a raster with {@code DataBuffer.TYPE_BYTE} transfer type.
+     * @throws IllegalArgumentException if {@code raster} does not have transfer type {@code DataBuffer.TYPE_BYTE}
+     * or {@code DataBuffer.TYPE_INT} with `SinglePixelPackedSampleModel`
+     * @throws NullPointerException if {@code raster} is {@code null}.
+     */
+    public static Raster asByteRaster(final Raster raster) {
+        return asByteRaster0(raster);
+    }
+
+    /**
+     * Returns a writable raster with {@code DataBuffer.TYPE_BYTE} transfer type.
+     * Works for any raster from a {@code BufferedImage.TYPE_INT_*} image.
+     *
+     * @param raster a {@code WritableRaster} with either transfer type {@code DataBuffer.TYPE_BYTE}
+     *               or {@code DataBuffer.TYPE_INT} with `SinglePixelPackedSampleModel`, not {@code null}.
+     * @return a writable raster with {@code DataBuffer.TYPE_BYTE} transfer type.
+     * @throws IllegalArgumentException if {@code raster} does not have transfer type {@code DataBuffer.TYPE_BYTE}
+     * or {@code DataBuffer.TYPE_INT} with `SinglePixelPackedSampleModel`
+     * @throws NullPointerException if {@code raster} is {@code null}.
+     */
+    public static WritableRaster asByteRaster(final WritableRaster raster) {
+        return (WritableRaster) asByteRaster0(raster);
+    }
+
+    private static Raster asByteRaster0(final Raster raster) {
+        switch (raster.getTransferType()) {
+            case DataBuffer.TYPE_BYTE:
+                return raster;
+            case DataBuffer.TYPE_INT:
+                SampleModel sampleModel = raster.getSampleModel();
+
+                if (!(sampleModel instanceof SinglePixelPackedSampleModel)) {
+                    throw new IllegalArgumentException(String.format("Requires SinglePixelPackedSampleModel, %s not supported", sampleModel.getClass().getSimpleName()));
+                }
+
+                final int bands = 4;
+                final DataBufferInt buffer = (DataBufferInt) raster.getDataBuffer();
+
+                int w = raster.getWidth();
+                int h = raster.getHeight();
+                int size = buffer.getSize();
+
+                return new WritableRaster(
+                        new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE, w, h, bands, w * bands, createBandOffsets((SinglePixelPackedSampleModel) sampleModel)),
+                        new DataBuffer(DataBuffer.TYPE_BYTE, size * bands) {
+                            final int[] MASKS = {
+                                    0xffffff00,
+                                    0xffff00ff,
+                                    0xff00ffff,
+                                    0x00ffffff,
+                            };
+
+                            @Override
+                            public int getElem(int bank, int i) {
+                                int index = i / bands;
+                                int shift = (i % bands) * 8;
+
+                                return (buffer.getElem(index) >>> shift) & 0xff;
+                            }
+
+                            @Override
+                            public void setElem(int bank, int i, int val) {
+                                int index = i / bands;
+                                int element = i % bands;
+                                int shift = element * 8;
+
+                                int value = (buffer.getElem(index) & MASKS[element]) | ((val & 0xff) << shift);
+                                buffer.setElem(index, value);
+                            }
+                        }, new Point()) {
+                };
+
+            default:
+                throw new IllegalArgumentException(String.format("Raster type %d not supported", raster.getTransferType()));
+        }
+    }
+
+    private static int[] createBandOffsets(final SinglePixelPackedSampleModel sampleModel) {
+        notNull(sampleModel, "sampleModel");
+
+        int[] masks = sampleModel.getBitMasks();
+        int[] offs = new int[masks.length];
+
+        for (int i = 0; i < masks.length; i++) {
+            int mask = masks[i];
+            int off = 0;
+
+            // TODO: FixMe! This only works for standard 8 bit masks (0xFF)
+            if (mask != 0) {
+                while ((mask & 0xFF) == 0) {
+                    mask >>>= 8;
+                    off++;
+                }
+            }
+
+            offs[i] = off;
+        }
+
+        return offs;
+    }
+}

imageio/imageio-core/src/main/resources/META-INF/services/javax.imageio.spi.ImageInputStreamSpi

@@ -1,2 +1,4 @@
 com.twelvemonkeys.imageio.stream.BufferedFileImageInputStreamSpi
 com.twelvemonkeys.imageio.stream.BufferedRAFImageInputStreamSpi
+# Use SPI loading as a hook for early profile activation
+com.twelvemonkeys.imageio.color.ProfileDeferralActivator$Spi

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

@@ -0,0 +1,247 @@
+package com.twelvemonkeys.imageio.color;
+
+import org.junit.Test;
+
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_ColorSpace;
+import java.awt.color.ICC_Profile;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+import static org.junit.Assert.*;
+
+public class ColorProfilesTest {
+    @Test
+    public void testCreateColorSpaceFromBrokenProfileIsFixedCS_sRGB() {
+        ICC_Profile internal = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
+        ICC_Profile profile = createBrokenProfile(internal);
+        assertNotSame(internal, profile); // Sanity check
+
+        assertTrue(ColorProfiles.isOffendingColorProfile(profile));
+
+        ICC_ColorSpace created = ColorSpaces.createColorSpace(profile);
+        assertSame(ColorSpace.getInstance(ColorSpace.CS_sRGB), created);
+        assertTrue(created.isCS_sRGB());
+    }
+
+    private ICC_Profile createBrokenProfile(ICC_Profile internal) {
+        byte[] data = internal.getData();
+        data[ICC_Profile.icHdrRenderingIntent] = 1; // Intent: 1 == Relative Colormetric Little Endian
+        data[ICC_Profile.icHdrRenderingIntent + 1] = 0;
+        data[ICC_Profile.icHdrRenderingIntent + 2] = 0;
+        data[ICC_Profile.icHdrRenderingIntent + 3] = 0;
+        return ICC_Profile.getInstance(data);
+    }
+
+    @Test
+    public void testIsOffendingColorProfile() {
+        ICC_Profile broken = createBrokenProfile(ICC_Profile.getInstance(ColorSpace.CS_GRAY));
+        assertTrue(ColorProfiles.isOffendingColorProfile(broken));
+    }
+
+    @Test
+    public void testIsCS_sRGBTrue() {
+        assertTrue(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_sRGB)));
+    }
+
+    @Test
+    public void testIsCS_sRGBFalse() {
+        assertFalse(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB)));
+        assertFalse(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ)));
+        assertFalse(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_GRAY)));
+        assertFalse(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_PYCC)));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testIsCS_sRGBNull() {
+        ColorProfiles.isCS_sRGB(null);
+    }
+
+    @Test
+    public void testIsCS_GRAYTrue() {
+        assertTrue(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_GRAY)));
+    }
+
+    @Test
+    public void testIsCS_GRAYFalse() {
+        assertFalse(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_sRGB)));
+        assertFalse(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB)));
+        assertFalse(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ)));
+        assertFalse(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_PYCC)));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testIsCS_GRAYNull() {
+        ColorProfiles.isCS_GRAY(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreateProfileNull() {
+        ColorProfiles.createProfile(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReadProfileNull() throws IOException {
+        ColorProfiles.readProfile(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreateProfileRawNull() {
+        ColorProfiles.createProfileRaw(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReadProfileRawNull() throws IOException {
+        ColorProfiles.readProfileRaw(null);
+    }
+
+    @Test
+    public void testCreateProfileRaw() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ICC_Profile profileRaw = ColorProfiles.createProfileRaw(data);
+        assertArrayEquals(data, profileRaw.getData());
+    }
+
+    @Test
+    public void testReadProfileRaw() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ICC_Profile profileRaw = ColorProfiles.readProfileRaw(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"));
+        assertArrayEquals(data, profileRaw.getData());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreateProfileRawBadData() {
+        ColorProfiles.createProfileRaw(new byte[5]);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReadProfileRawBadData() throws IOException {
+        // NOTE: The array here is larger, as there's a bug in OpenJDK 15 & 16, that throws
+        // ArrayIndexOutOfBoundsException if the stream is shorter than the profile signature...
+        ColorProfiles.readProfileRaw(new ByteArrayInputStream(new byte[40]));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreateProfileBadData() {
+        ColorProfiles.createProfile(new byte[5]);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReadProfileBadData() throws IOException {
+        ColorProfiles.readProfile(new ByteArrayInputStream(new byte[5]));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreateProfileRawTruncated() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ColorProfiles.createProfileRaw(Arrays.copyOf(data, 200));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReadProfileRawTruncated() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ColorProfiles.readProfileRaw(new ByteArrayInputStream(data, 0, 200));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreateProfileTruncated() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ColorProfiles.createProfile(Arrays.copyOf(data, 200));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReadProfileTruncated() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ColorProfiles.readProfile(new ByteArrayInputStream(data, 0, 200));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreateProfileRawTruncatedHeader() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ColorProfiles.createProfileRaw(Arrays.copyOf(data, 125));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReadProfileRawTruncatedHeader() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ColorProfiles.readProfileRaw(new ByteArrayInputStream(data, 0, 125));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCreateProfileTruncatedHeader() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ColorProfiles.createProfile(Arrays.copyOf(data, 125));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReadProfileTruncatedHeader() throws IOException {
+        byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData();
+        ColorProfiles.readProfile(new ByteArrayInputStream(data, 0, 125));
+    }
+
+    @Test
+    public void testCreateProfileBytesSame() throws IOException {
+        ICC_Profile profile = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"));
+        ICC_Profile profile1 = ColorProfiles.createProfile(profile.getData());
+        ICC_Profile profile2 = ColorProfiles.createProfile(profile.getData());
+
+        assertEquals(profile1, profile2);
+        assertSame(profile1, profile2);
+    }
+
+    @Test
+    public void testReadProfileInputStreamSame() throws IOException {
+        ICC_Profile profile1 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"));
+        ICC_Profile profile2 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"));
+
+        assertEquals(profile1, profile2);
+        assertSame(profile1, profile2);
+    }
+
+    @Test
+    public void testReadProfileDifferent() throws IOException {
+        // These profiles are extracted from various JPEGs, and have the exact same profile header (but are different profiles)...
+        ICC_Profile profile1 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"));
+        ICC_Profile profile2 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/color_match_rgb.icc"));
+
+        assertNotSame(profile1, profile2);
+    }
+
+    @Test
+    public void testCreateProfileBytesSameAsCached() throws IOException {
+        ICC_Profile profile = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"));
+        ICC_ColorSpace cs1 = ColorSpaces.createColorSpace(profile);
+        ICC_Profile profile2 = ColorProfiles.createProfile(profile.getData());
+
+        assertEquals(cs1.getProfile(), profile2);
+        assertSame(cs1.getProfile(), profile2);
+    }
+
+    @Test
+    public void testReadProfileInputStreamSameAsCached() throws IOException {
+        ICC_ColorSpace cs1 = ColorSpaces.createColorSpace(ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")));
+        ICC_Profile profile2 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"));
+
+        assertEquals(cs1.getProfile(), profile2);
+        assertSame(cs1.getProfile(), profile2);
+    }
+
+    @Test
+    public void testCreateProfileBytesSameAsInternal() {
+        ICC_Profile profile1 = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
+        ICC_Profile profile2 = ColorProfiles.createProfile(ICC_Profile.getInstance(ColorSpace.CS_sRGB).getData());
+
+        assertEquals(profile1, profile2);
+        assertSame(profile1, profile2);
+    }
+
+    @Test
+    public void testReadProfileInputStreamSameAsInternal() throws IOException {
+        ICC_Profile profile1 = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
+        ICC_Profile profile2 = ColorProfiles.readProfile(new ByteArrayInputStream(ICC_Profile.getInstance(ColorSpace.CS_sRGB).getData()));
+
+        assertEquals(profile1, profile2);
+        assertSame(profile1, profile2);
+    }
+}

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

@@ -90,34 +90,6 @@ public class ColorSpacesTest {
         assertTrue(created.isCS_sRGB());
     }
 
-    @Test
-    public void testCreateColorSpaceFromBrokenProfileIsFixedCS_sRGB() {
-        ICC_Profile internal = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
-        ICC_Profile profile = createBrokenProfile(internal);
-        assertNotSame(internal, profile); // Sanity check
-
-        assertTrue(ColorSpaces.isOffendingColorProfile(profile));
-
-        ICC_ColorSpace created = ColorSpaces.createColorSpace(profile);
-        assertSame(ColorSpace.getInstance(ColorSpace.CS_sRGB), created);
-        assertTrue(created.isCS_sRGB());
-    }
-
-    private ICC_Profile createBrokenProfile(ICC_Profile internal) {
-        byte[] data = internal.getData();
-        data[ICC_Profile.icHdrRenderingIntent] = 1; // Intent: 1 == Relative Colormetric Little Endian
-        data[ICC_Profile.icHdrRenderingIntent + 1] = 0;
-        data[ICC_Profile.icHdrRenderingIntent + 2] = 0;
-        data[ICC_Profile.icHdrRenderingIntent + 3] = 0;
-        return ICC_Profile.getInstance(data);
-    }
-
-    @Test
-    public void testIsOffendingColorProfile() {
-        ICC_Profile broken = createBrokenProfile(ICC_Profile.getInstance(ColorSpace.CS_GRAY));
-        assertTrue(ColorSpaces.isOffendingColorProfile(broken));
-    }
-
     @Test
     public void testCreateColorSpaceFromKnownProfileReturnsInternalCS_GRAY() {
         ICC_Profile profile = ICC_Profile.getInstance(ColorSpace.CS_GRAY);
@@ -166,11 +138,13 @@ public class ColorSpacesTest {
         assertEquals(ColorSpace.TYPE_CMYK, ColorSpaces.getColorSpace(ColorSpaces.CS_GENERIC_CMYK).getType());
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testIsCS_sRGBTrue() {
         assertTrue(ColorSpaces.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_sRGB)));
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testIsCS_sRGBFalse() {
         assertFalse(ColorSpaces.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB)));
@@ -179,14 +153,36 @@ public class ColorSpacesTest {
         assertFalse(ColorSpaces.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_PYCC)));
     }
 
+    @SuppressWarnings("deprecation")
     @Test(expected = IllegalArgumentException.class)
     public void testIsCS_sRGBNull() {
         ColorSpaces.isCS_sRGB(null);
     }
 
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testIsCS_GRAYTrue() {
+        assertTrue(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_GRAY)));
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testIsCS_GRAYFalse() {
+        assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_sRGB)));
+        assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB)));
+        assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ)));
+        assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_PYCC)));
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test(expected = IllegalArgumentException.class)
+    public void testIsCS_GRAYNull() {
+        ColorSpaces.isCS_GRAY(null);
+    }
+
     @Test
     public void testEqualHeadersDifferentProfile() throws IOException {
-        // These profiles are extracted from various JPEGs, and have the exact same profile header...
+        // These profiles are extracted from various JPEGs, and have the exact same profile header (but are different)...
         ICC_Profile profile1 = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"));
         ICC_Profile profile2 = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/color_match_rgb.icc"));
 

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

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

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

@@ -0,0 +1,28 @@
+package com.twelvemonkeys.imageio.color;
+
+import org.junit.Test;
+
+import javax.imageio.spi.ImageInputStreamSpi;
+import javax.imageio.spi.ServiceRegistry;
+
+import static org.mockito.Mockito.*;
+
+public class ProfileDeferralActivatorTest {
+
+    @Test
+    public void testActivateProfiles() {
+        // Should just run with no exceptions...
+        ProfileDeferralActivator.activateProfiles();
+    }
+
+    @Test
+    public void testSpiRegistration() {
+        ProfileDeferralActivator.Spi spi = new ProfileDeferralActivator.Spi();
+        ServiceRegistry registry = mock(ServiceRegistry.class);
+        Class<ImageInputStreamSpi> category = ImageInputStreamSpi.class;
+
+        spi.onRegistration(registry, category);
+
+        verify(registry, only()).deregisterServiceProvider(spi, category);
+    }
+}

imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedFileImageInputStreamTest.java

@@ -67,8 +67,9 @@ public class BufferedFileImageInputStreamTest {
 
     @Test
     public void testCreate() throws IOException {
-        BufferedFileImageInputStream stream = new BufferedFileImageInputStream(File.createTempFile("empty", ".tmp"));
-        assertEquals("Data length should be same as stream length", 0, stream.length());
+        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(File.createTempFile("empty", ".tmp"))) {
+            assertEquals("Data length should be same as stream length", 0, stream.length());
+        }
     }
 
     @Test
@@ -104,12 +105,12 @@ public class BufferedFileImageInputStreamTest {
         byte[] data = new byte[1024 * 1024];
         File file = randomDataToFile(data);
 
-        BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file);
+        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            assertEquals("File length should be same as stream length", file.length(), stream.length());
 
-        assertEquals("File length should be same as stream length", file.length(), stream.length());
-
-        for (byte value : data) {
-            assertEquals("Wrong data read", value & 0xff, stream.read());
+            for (byte value : data) {
+                assertEquals("Wrong data read", value & 0xff, stream.read());
+            }
         }
     }
 
@@ -118,15 +119,15 @@ public class BufferedFileImageInputStreamTest {
         byte[] data = new byte[1024 * 1024];
         File file = randomDataToFile(data);
 
-        BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file);
+        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            assertEquals("File length should be same as stream length", file.length(), stream.length());
 
-        assertEquals("File length should be same as stream length", file.length(), stream.length());
+            byte[] result = new byte[1024];
 
-        byte[] result = new byte[1024];
-
-        for (int i = 0; i < data.length / result.length; i++) {
-            stream.readFully(result);
-            assertTrue("Wrong data read: " + i, rangeEquals(data, i * result.length, result, 0, result.length));
+            for (int i = 0; i < data.length / result.length; i++) {
+                stream.readFully(result);
+                assertTrue("Wrong data read: " + i, rangeEquals(data, i * result.length, result, 0, result.length));
+            }
         }
     }
 
@@ -135,16 +136,16 @@ public class BufferedFileImageInputStreamTest {
         byte[] data = new byte[1024 * 14];
         File file = randomDataToFile(data);
 
-        BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file);
+        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            assertEquals("File length should be same as stream length", file.length(), stream.length());
 
-        assertEquals("File length should be same as stream length", file.length(), stream.length());
+            byte[] result = new byte[7];
 
-        byte[] result = new byte[7];
-
-        for (int i = 0; i < data.length / result.length; i += 2) {
-            stream.readFully(result);
-            stream.skipBytes(result.length);
-            assertTrue("Wrong data read: " + i, rangeEquals(data, i * result.length, result, 0, result.length));
+            for (int i = 0; i < data.length / result.length; i += 2) {
+                stream.readFully(result);
+                stream.skipBytes(result.length);
+                assertTrue("Wrong data read: " + i, rangeEquals(data, i * result.length, result, 0, result.length));
+            }
         }
     }
 
@@ -153,19 +154,35 @@ public class BufferedFileImageInputStreamTest {
         byte[] data = new byte[1024 * 18];
         File file = randomDataToFile(data);
 
-        BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file);
+        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            assertEquals("File length should be same as stream length", file.length(), stream.length());
 
-        assertEquals("File length should be same as stream length", file.length(), stream.length());
+            byte[] result = new byte[9];
 
-        byte[] result = new byte[9];
+            for (int i = 0; i < data.length / result.length; i++) {
+                // Read backwards
+                long newPos = stream.length() - result.length - i * result.length;
+                stream.seek(newPos);
+                assertEquals("Wrong stream position", newPos, stream.getStreamPosition());
+                stream.readFully(result);
+                assertTrue("Wrong data read: " + i, rangeEquals(data, (int) newPos, result, 0, result.length));
+            }
+        }
+    }
 
-        for (int i = 0; i < data.length / result.length; i++) {
-            // Read backwards
-            long newPos = stream.length() - result.length - i * result.length;
-            stream.seek(newPos);
-            assertEquals("Wrong stream position", newPos, stream.getStreamPosition());
-            stream.readFully(result);
-            assertTrue("Wrong data read: " + i, rangeEquals(data, (int) newPos, result, 0, result.length));
+    @Test
+    public void testReadOutsideDataSeek0Read() throws IOException {
+        byte[] data = new byte[256];
+        File file = randomDataToFile(data);
+
+        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            assertEquals("File length should be same as stream length", file.length(), stream.length());
+
+            byte[] buffer = new byte[data.length * 2];
+            stream.read(buffer);
+            stream.seek(0);
+            assertNotEquals(-1, stream.read());
+            assertNotEquals(-1, stream.read(buffer));
         }
     }
 
@@ -176,10 +193,10 @@ public class BufferedFileImageInputStreamTest {
         long value = ByteBuffer.wrap(bytes).getLong();
 
         // Create stream
-        ImageInputStream stream = new BufferedFileImageInputStream(file);
-
-        for (int i = 1; i <= 64; i++) {
-            assertEquals(String.format("bit %d differ", i), (value << (i - 1L)) >>> 63L, stream.readBit());
+        try (ImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            for (int i = 1; i <= 64; i++) {
+                assertEquals(String.format("bit %d differ", i), (value << (i - 1L)) >>> 63L, stream.readBit());
+            }
         }
     }
 
@@ -190,12 +207,12 @@ public class BufferedFileImageInputStreamTest {
         long value = ByteBuffer.wrap(bytes).getLong();
 
         // Create stream
-        ImageInputStream stream = new BufferedFileImageInputStream(file);
-
-        for (int i = 1; i <= 64; i++) {
-            stream.seek(0);
-            assertEquals(String.format("bit %d differ", i), value >>> (64L - i), stream.readBits(i));
-            assertEquals(i % 8, stream.getBitOffset());
+        try (ImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            for (int i = 1; i <= 64; i++) {
+                stream.seek(0);
+                assertEquals(String.format("bit %d differ", i), value >>> (64L - i), stream.readBits(i));
+                assertEquals(i % 8, stream.getBitOffset());
+            }
         }
     }
 
@@ -206,13 +223,13 @@ public class BufferedFileImageInputStreamTest {
         long value = ByteBuffer.wrap(bytes).getLong();
 
         // Create stream
-        ImageInputStream stream = new BufferedFileImageInputStream(file);
-
-        for (int i = 1; i <= 60; i++) {
-            stream.seek(0);
-            stream.setBitOffset(i % 8);
-            assertEquals(String.format("bit %d differ", i), (value << (i % 8)) >>> (64L - i), stream.readBits(i));
-            assertEquals(i * 2 % 8, stream.getBitOffset());
+        try (ImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            for (int i = 1; i <= 60; i++) {
+                stream.seek(0);
+                stream.setBitOffset(i % 8);
+                assertEquals(String.format("bit %d differ", i), (value << (i % 8)) >>> (64L - i), stream.readBits(i));
+                assertEquals(i * 2 % 8, stream.getBitOffset());
+            }
         }
     }
 
@@ -221,35 +238,37 @@ public class BufferedFileImageInputStreamTest {
         byte[] bytes = new byte[8743]; // Slightly more than one buffer size
         File file = randomDataToFile(bytes);
         ByteBuffer buffer = ByteBuffer.wrap(bytes).order(ByteOrder.BIG_ENDIAN);
-        final ImageInputStream stream = new BufferedFileImageInputStream(file);
-        stream.setByteOrder(ByteOrder.BIG_ENDIAN);
 
-        for (int i = 0; i < bytes.length / 2; i++) {
-            assertEquals(buffer.getShort(), stream.readShort());
-        }
+        try (final ImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            stream.setByteOrder(ByteOrder.BIG_ENDIAN);
 
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readShort();
+            for (int i = 0; i < bytes.length / 2; i++) {
+                assertEquals(buffer.getShort(), stream.readShort());
             }
-        });
 
-        stream.seek(0);
-        stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
-        buffer.position(0);
-        buffer.order(ByteOrder.LITTLE_ENDIAN);
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readShort();
+                }
+            });
 
-        for (int i = 0; i < bytes.length / 2; i++) {
-            assertEquals(buffer.getShort(), stream.readShort());
-        }
+            stream.seek(0);
+            stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+            buffer.position(0);
+            buffer.order(ByteOrder.LITTLE_ENDIAN);
 
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readShort();
+            for (int i = 0; i < bytes.length / 2; i++) {
+                assertEquals(buffer.getShort(), stream.readShort());
             }
-        });
+
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readShort();
+                }
+            });
+        }
     }
 
     @Test
@@ -257,35 +276,37 @@ public class BufferedFileImageInputStreamTest {
         byte[] bytes = new byte[8743]; // Slightly more than one buffer size
         File file = randomDataToFile(bytes);
         ByteBuffer buffer = ByteBuffer.wrap(bytes).order(ByteOrder.BIG_ENDIAN);
-        final ImageInputStream stream = new BufferedFileImageInputStream(file);
-        stream.setByteOrder(ByteOrder.BIG_ENDIAN);
 
-        for (int i = 0; i < bytes.length / 4; i++) {
-            assertEquals(buffer.getInt(), stream.readInt());
-        }
+        try (final ImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            stream.setByteOrder(ByteOrder.BIG_ENDIAN);
 
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readInt();
+            for (int i = 0; i < bytes.length / 4; i++) {
+                assertEquals(buffer.getInt(), stream.readInt());
             }
-        });
 
-        stream.seek(0);
-        stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
-        buffer.position(0);
-        buffer.order(ByteOrder.LITTLE_ENDIAN);
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readInt();
+                }
+            });
 
-        for (int i = 0; i < bytes.length / 4; i++) {
-            assertEquals(buffer.getInt(), stream.readInt());
-        }
+            stream.seek(0);
+            stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+            buffer.position(0);
+            buffer.order(ByteOrder.LITTLE_ENDIAN);
 
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readInt();
+            for (int i = 0; i < bytes.length / 4; i++) {
+                assertEquals(buffer.getInt(), stream.readInt());
             }
-        });
+
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readInt();
+                }
+            });
+        }
     }
 
     @Test
@@ -293,35 +314,37 @@ public class BufferedFileImageInputStreamTest {
         byte[] bytes = new byte[8743]; // Slightly more than one buffer size
         File file = randomDataToFile(bytes);
         ByteBuffer buffer = ByteBuffer.wrap(bytes).order(ByteOrder.BIG_ENDIAN);
-        final ImageInputStream stream = new BufferedFileImageInputStream(file);
-        stream.setByteOrder(ByteOrder.BIG_ENDIAN);
 
-        for (int i = 0; i < bytes.length / 8; i++) {
-            assertEquals(buffer.getLong(), stream.readLong());
-        }
+        try (final ImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            stream.setByteOrder(ByteOrder.BIG_ENDIAN);
 
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readLong();
+            for (int i = 0; i < bytes.length / 8; i++) {
+                assertEquals(buffer.getLong(), stream.readLong());
             }
-        });
 
-        stream.seek(0);
-        stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
-        buffer.position(0);
-        buffer.order(ByteOrder.LITTLE_ENDIAN);
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readLong();
+                }
+            });
 
-        for (int i = 0; i < bytes.length / 8; i++) {
-            assertEquals(buffer.getLong(), stream.readLong());
-        }
+            stream.seek(0);
+            stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+            buffer.position(0);
+            buffer.order(ByteOrder.LITTLE_ENDIAN);
 
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readLong();
+            for (int i = 0; i < bytes.length / 8; i++) {
+                assertEquals(buffer.getLong(), stream.readLong());
             }
-        });
+
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readLong();
+                }
+            });
+        }
     }
 
     @Test
@@ -329,49 +352,50 @@ public class BufferedFileImageInputStreamTest {
         byte[] bytes = new byte[9];
         File file = randomDataToFile(bytes);
 
-        final ImageInputStream stream = new BufferedFileImageInputStream(file);
-        stream.seek(1000);
+        try (final ImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            stream.seek(1000);
 
-        assertEquals(-1, stream.read());
-        assertEquals(-1, stream.read(new byte[1], 0, 1));
+            assertEquals(-1, stream.read());
+            assertEquals(-1, stream.read(new byte[1], 0, 1));
 
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readFully(new byte[1]);
-            }
-        });
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readByte();
-            }
-        });
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readShort();
-            }
-        });
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readInt();
-            }
-        });
-        assertThrows(EOFException.class, new ThrowingRunnable() {
-            @Override
-            public void run() throws Throwable {
-                stream.readLong();
-            }
-        });
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readFully(new byte[1]);
+                }
+            });
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readByte();
+                }
+            });
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readShort();
+                }
+            });
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readInt();
+                }
+            });
+            assertThrows(EOFException.class, new ThrowingRunnable() {
+                @Override
+                public void run() throws Throwable {
+                    stream.readLong();
+                }
+            });
 
-        stream.seek(0);
-        for (byte value : bytes) {
-            assertEquals(value, stream.readByte());
+            stream.seek(0);
+            for (byte value : bytes) {
+                assertEquals(value, stream.readByte());
+            }
+
+            assertEquals(-1, stream.read());
         }
-
-        assertEquals(-1, stream.read());
     }
 
     @Test
@@ -383,4 +407,23 @@ public class BufferedFileImageInputStreamTest {
         stream.close();
         verify(mock, only()).close();
     }
+
+    @Test
+    public void testWorkaroundForWBMPImageReaderExpectsReadToBehaveAsReadFully() throws IOException {
+        // See #606 for details.
+        // Bug in JDK WBMPImageReader, uses read(byte[], int, int) instead of readFully(byte[], int, int).
+        // Ie: Relies on read to return all bytes at once, without blocking
+        int size = BufferedFileImageInputStream.DEFAULT_BUFFER_SIZE * 7;
+        byte[] bytes = new byte[size];
+        File file = randomDataToFile(bytes);
+
+        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
+            byte[] result = new byte[size];
+            int head = stream.read(result, 0, 12);          // Provoke a buffered read
+            int len = stream.read(result, 12, size - 12);   // Rest of buffer + direct read
+
+            assertEquals(size, len + head);
+            assertArrayEquals(bytes, result);
+        }
+   }
 }

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

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

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

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

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

@@ -0,0 +1,199 @@
+package com.twelvemonkeys.imageio.util;
+
+import org.junit.Test;
+
+import javax.imageio.ImageTypeSpecifier;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+/**
+ * RasterUtilsTest.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: RasterUtilsTest.java,v 1.0 05/05/2021 haraldk Exp$
+ */
+public class RasterUtilsTest {
+    @Test(expected = NullPointerException.class)
+    public void testAsByteRasterFromNull() {
+        RasterUtils.asByteRaster((Raster) null);
+    }
+
+    @SuppressWarnings("RedundantCast")
+    @Test(expected = NullPointerException.class)
+    public void testAsByteRasterWritableFromNull() {
+        RasterUtils.asByteRaster((WritableRaster) null);
+    }
+
+    @Test
+    public void testAsByteRasterPassThrough() {
+        WritableRaster[] rasters = new WritableRaster[] {
+                new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR).getRaster(),
+                new BufferedImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR).getRaster(),
+                new BufferedImage(1, 1, BufferedImage.TYPE_4BYTE_ABGR_PRE).getRaster(),
+                new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY).getRaster(),
+                Raster.createBandedRaster(DataBuffer.TYPE_BYTE, 1, 1, 7, null),
+                Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, 1, 1, 2, null),
+                new WritableRaster(new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE, 1, 1, 1, 1, new int[1]), new Point(0, 0)) {}
+        };
+
+        for (Raster raster : rasters) {
+            assertSame(raster, RasterUtils.asByteRaster(raster));
+        }
+
+        for (WritableRaster raster : rasters) {
+            assertSame(raster, RasterUtils.asByteRaster(raster));
+        }
+    }
+
+    @Test
+    public void testAsByteRasterWritableFromTYPE_INT_RGB() {
+        BufferedImage image = new BufferedImage(9, 11, BufferedImage.TYPE_INT_RGB);
+
+        WritableRaster raster = RasterUtils.asByteRaster(image.getRaster());
+
+        assertEquals(DataBuffer.TYPE_BYTE, raster.getTransferType());
+        assertEquals(PixelInterleavedSampleModel.class, raster.getSampleModel().getClass());
+        assertEquals(image.getWidth(), raster.getWidth());
+        assertEquals(image.getHeight(), raster.getHeight());
+
+        assertEquals(3, raster.getNumBands());
+        assertEquals(3, raster.getNumDataElements());
+
+        assertImageRasterEquals(image, raster);
+    }
+
+    @Test
+    public void testAsByteRasterWritableFromTYPE_INT_ARGB() {
+        BufferedImage image = new BufferedImage(9, 11, BufferedImage.TYPE_INT_ARGB);
+
+        WritableRaster raster = RasterUtils.asByteRaster(image.getRaster());
+
+        assertEquals(DataBuffer.TYPE_BYTE, raster.getTransferType());
+        assertEquals(PixelInterleavedSampleModel.class, raster.getSampleModel().getClass());
+        assertEquals(image.getWidth(), raster.getWidth());
+        assertEquals(image.getHeight(), raster.getHeight());
+
+        assertEquals(4, raster.getNumBands());
+        assertEquals(4, raster.getNumDataElements());
+
+        assertImageRasterEquals(image, raster);
+    }
+
+    @Test
+    public void testAsByteRasterWritableFromTYPE_INT_ARGB_PRE() {
+        BufferedImage image = new BufferedImage(9, 11, BufferedImage.TYPE_INT_ARGB_PRE);
+
+        WritableRaster raster = RasterUtils.asByteRaster(image.getRaster());
+
+        assertEquals(DataBuffer.TYPE_BYTE, raster.getTransferType());
+        assertEquals(PixelInterleavedSampleModel.class, raster.getSampleModel().getClass());
+        assertEquals(image.getWidth(), raster.getWidth());
+        assertEquals(image.getHeight(), raster.getHeight());
+
+        assertEquals(4, raster.getNumBands());
+        assertEquals(4, raster.getNumDataElements());
+
+        // We don't assert on values here, as the premultiplied values makes it hard...
+    }
+
+    @Test
+    public void testAsByteRasterWritableFromTYPE_INT_BGR() {
+        BufferedImage image = new BufferedImage(9, 11, BufferedImage.TYPE_INT_BGR);
+
+        WritableRaster raster = RasterUtils.asByteRaster(image.getRaster());
+
+        assertEquals(DataBuffer.TYPE_BYTE, raster.getTransferType());
+        assertEquals(PixelInterleavedSampleModel.class, raster.getSampleModel().getClass());
+        assertEquals(image.getWidth(), raster.getWidth());
+        assertEquals(image.getHeight(), raster.getHeight());
+
+        assertEquals(3, raster.getNumBands());
+        assertEquals(3, raster.getNumDataElements());
+
+        assertImageRasterEquals(image, raster);
+    }
+
+    @Test
+    public void testAsByteRasterWritableFromTYPE_CUSTOM_GRAB() {
+        BufferedImage image = ImageTypeSpecifier.createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                0x00FF0000,
+                0xFF000000,
+                0x000000FF,
+                0x0000FF00,
+                DataBuffer.TYPE_INT, false).createBufferedImage(7, 13);
+
+        WritableRaster raster = RasterUtils.asByteRaster(image.getRaster());
+
+        assertEquals(DataBuffer.TYPE_BYTE, raster.getTransferType());
+        assertEquals(PixelInterleavedSampleModel.class, raster.getSampleModel().getClass());
+        assertEquals(image.getWidth(), raster.getWidth());
+        assertEquals(image.getHeight(), raster.getHeight());
+
+        assertEquals(4, raster.getNumBands());
+        assertEquals(4, raster.getNumDataElements());
+
+        assertImageRasterEquals(image, raster);
+    }
+
+    @Test
+    public void testAsByteRasterWritableFromTYPE_CUSTOM_BxRG() {
+        BufferedImage image = ImageTypeSpecifier.createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                0x0000FF00,
+                0x000000FF,
+                0xFF000000,
+                0,
+                DataBuffer.TYPE_INT, false).createBufferedImage(7, 13);
+
+        WritableRaster raster = RasterUtils.asByteRaster(image.getRaster());
+
+        assertEquals(DataBuffer.TYPE_BYTE, raster.getTransferType());
+        assertEquals(PixelInterleavedSampleModel.class, raster.getSampleModel().getClass());
+        assertEquals(image.getWidth(), raster.getWidth());
+        assertEquals(image.getHeight(), raster.getHeight());
+
+        assertEquals(3, raster.getNumBands());
+        assertEquals(3, raster.getNumDataElements());
+
+        assertImageRasterEquals(image, raster);
+    }
+
+    private static void assertImageRasterEquals(BufferedImage image, WritableRaster raster) {
+        // NOTE: This is NOT necessarily how the values are stored in the data buffer
+        int[] argbOffs = new int[] {16, 8, 0, 24};
+
+        Raster imageRaster = image.getRaster();
+
+        Random rng = new Random(27365481723L);
+
+        for (int y = 0; y < raster.getHeight(); y++) {
+            for (int x = 0; x < raster.getWidth(); x++) {
+                int argb = 0;
+
+                for (int b = 0; b < raster.getNumBands(); b++) {
+                    int s = rng.nextInt(0xFF);
+                    raster.setSample(x, y, b, s);
+
+                    assertEquals(s, raster.getSample(x, y, b));
+                    assertEquals(s, imageRaster.getSample(x, y, b));
+
+                    argb |= (s << argbOffs[b]);
+                }
+
+                if (raster.getNumBands() < 4) {
+                    argb |= 0xFF000000;
+                }
+
+                int expectedArgb = image.getRGB(x, y);
+                if (argb != expectedArgb) {
+                    assertEquals(x + ", " + y + ": ",  String.format("#%08x", expectedArgb), String.format("#%08x", argb));
+                }
+            }
+        }
+    }
+}

imageio/imageio-hdr/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-hdr</artifactId>
     <name>TwelveMonkeys :: ImageIO :: HDR plugin</name>

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

@@ -38,12 +38,14 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import static java.util.Collections.emptyList;
+
 /**
- * TGAImageReaderTest
+ * HDRImageReaderTest
  *
  * @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$
+ * @version $Id: HDRImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$
  */
 public class HDRImageReaderTest extends ImageReaderAbstractTest<HDRImageReader> {
     @Override
@@ -58,6 +60,12 @@ public class HDRImageReaderTest extends ImageReaderAbstractTest<HDRImageReader>
         );
     }
 
+    @Override
+    protected List<TestData> getTestDataForAffineTransformOpCompatibility() {
+        // HDR images uses floating point buffers...
+        return emptyList();
+    }
+
     @Override
     protected List<String> getFormatNames() {
         return Arrays.asList("HDR", "hdr", "RGBE", "rgbe");

imageio/imageio-icns/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-icns</artifactId>
     <name>TwelveMonkeys :: ImageIO :: ICNS plugin</name>

imageio/imageio-iff/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-iff</artifactId>
     <name>TwelveMonkeys :: ImageIO :: IFF plugin</name>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-jpeg-jai-interop</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JPEG/JAI TIFF Interop</name>
@@ -13,14 +13,27 @@
     </description>
 
     <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.jaiinterop</project.jpms.module.name>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg.jaiinterop</project.jpms.module.name>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-core</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>

imageio/imageio-jpeg-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/jaiinterop/JAITIFFImageReaderInteroperabilityTest.java

@@ -78,7 +78,7 @@ public class JAITIFFImageReaderInteroperabilityTest extends ImageReaderAbstractT
     @Override
     protected List<TestData> getTestData() {
         return Arrays.asList(
-                new TestData(getClassLoaderResource("/tiff/foto_0001.tif"), new Dimension(1663, 2338)), // Little endian, Old JPEG
+                new TestData(getClassLoaderResource("/tiff/foto_0001.tif"), new Dimension(1663, 2338), new Dimension(1663, 2337)), // Little endian, Old JPEG
                 new TestData(getClassLoaderResource("/tiff/cmyk_jpeg.tif"), new Dimension(100, 100)), // CMYK, JPEG compressed, with ICC profile
                 new TestData(getClassLoaderResource("/tiff/jpeg-lossless-8bit-gray.tif"), new Dimension(512, 512))  // Lossless JPEG Gray, 8 bit/sample
         );

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-jpeg-jep262-interop</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JPEG/JEP-262 Interop</name>
@@ -13,9 +13,21 @@
     </description>
 
     <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.jep262interop</project.jpms.module.name>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg.jep262interop</project.jpms.module.name>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>

imageio/imageio-jpeg-jep262-interop/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/jep262interop/JEP262TIFFImageReaderInteroperabilityTest.java

@@ -33,6 +33,7 @@ package com.twelvemonkeys.imageio.plugins.jpeg.jep262interop;
 import com.twelvemonkeys.imageio.plugins.jpeg.JPEGImageReaderSpi;
 import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -48,7 +49,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
 
 /**
  * Tests the JEP 262 TIFFImageReader delegating to our JPEGImageReader.
@@ -74,15 +74,13 @@ public class JEP262TIFFImageReaderInteroperabilityTest extends ImageReaderAbstra
         }
 
         // Skip tests if we have no Spi (ie. pre JDK 9)
-        assumeTrue("Provider " + JEP_262_PROVIDER_CLASS_NAME + " not found", false);
-
-        return null;
+        throw new AssumptionViolatedException("Provider " + JEP_262_PROVIDER_CLASS_NAME + " not found");
     }
 
     @Override
     protected List<TestData> getTestData() {
         return Arrays.asList(
-                new TestData(getClassLoaderResource("/tiff/foto_0001.tif"), new Dimension(1663, 2338)), // Little endian, Old JPEG
+                new TestData(getClassLoaderResource("/tiff/foto_0001.tif"), new Dimension(1663, 2338), new Dimension(1663, 2337)), // Little endian, Old JPEG
                 new TestData(getClassLoaderResource("/tiff/cmyk_jpeg.tif"), new Dimension(100, 100)), // CMYK, JPEG compressed, with ICC profile
                 new TestData(getClassLoaderResource("/tiff/jpeg-lossless-8bit-gray.tif"), new Dimension(512, 512))  // Lossless JPEG Gray, 8 bit/sample
         );

imageio/imageio-jpeg/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-jpeg</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JPEG plugin</name>

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

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

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

@@ -31,6 +31,7 @@
 package com.twelvemonkeys.imageio.plugins.jpeg;
 
 import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.color.ColorProfiles;
 import com.twelvemonkeys.imageio.color.ColorSpaces;
 import com.twelvemonkeys.imageio.color.YCbCrConverter;
 import com.twelvemonkeys.imageio.metadata.CompoundDirectory;
@@ -123,7 +124,7 @@ public final class JPEGImageReader extends ImageReaderBase {
     private int currentStreamIndex = 0;
     private final List<Long> streamOffsets = new ArrayList<>();
 
-    protected JPEGImageReader(final ImageReaderSpi provider, final ImageReader delegate) {
+    JPEGImageReader(final ImageReaderSpi provider, final ImageReader delegate) {
         super(provider);
 
         this.delegate = Validate.notNull(delegate);
@@ -335,7 +336,7 @@ public final 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.
         else if (bogusAdobeDCT
-                || profile != null && !ColorSpaces.isCS_sRGB(profile)
+                || profile != null && !ColorProfiles.isCS_sRGB(profile)
                 || (long) sof.lines * sof.samplesPerLine > Integer.MAX_VALUE
                 || delegateCSTypeMismatch(jfif, adobeDCT, sof, sourceCSType)) {
             if (DEBUG) {
@@ -614,7 +615,7 @@ public final class JPEGImageReader extends ImageReaderBase {
         }
     }
 
-    private ICC_Profile ensureDisplayProfile(final ICC_Profile profile) {
+    private ICC_Profile ensureDisplayProfile(final ICC_Profile profile) throws IOException {
         // 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
 
@@ -630,7 +631,7 @@ public final class JPEGImageReader extends ImageReaderBase {
 
                 intToBigEndian(ICC_Profile.icSigDisplayClass, profileData, ICC_Profile.icHdrDeviceClass); // Header is first
 
-                return ICC_Profile.getInstance(profileData);
+                return ColorProfiles.createProfile(profileData);
             }
         }
 
@@ -950,11 +951,7 @@ public final class JPEGImageReader extends ImageReaderBase {
                 return null;
             }
 
-            int segmentDataStart = segment.identifier.length() + 3; // ICC_PROFILE + null + chunk number + count
-            int iccChunkDataSize = segment.data.length - segmentDataStart;
-            int iccSize = segment.data.length < segmentDataStart + 4 ? 0 : intFromBigEndian(segment.data, segmentDataStart);
-
-            return readICCProfileSafe(stream, allowBadIndexes, iccSize, iccChunkDataSize);
+            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...
@@ -989,9 +986,6 @@ public final class JPEGImageReader extends ImageReaderBase {
             InputStream[] streams = new InputStream[count];
             streams[badICC ? 0 : chunkNumber - 1] = stream;
 
-            int iccChunkDataSize = 0;
-            int iccSize = 0;
-
             for (int i = 1; i < count; i++) {
                 Application segment = segments.get(i);
                 stream = new DataInputStream(segment.data());
@@ -1004,33 +998,20 @@ public final class JPEGImageReader extends ImageReaderBase {
 
                 int index = badICC ? i : chunkNumber - 1;
                 streams[index] = stream;
-
-                int segmentDataStart = segment.identifier.length() + 3; // ICC_PROFILE + null + chunk number + count
-                iccChunkDataSize += segment.data.length - segmentDataStart;
-                if (index == 0) {
-                    iccSize = intFromBigEndian(segment.data, segmentDataStart);
-                }
             }
 
-            return readICCProfileSafe(new SequenceInputStream(Collections.enumeration(Arrays.asList(streams))), allowBadIndexes, iccSize, iccChunkDataSize);
+            return readICCProfileSafe(new SequenceInputStream(Collections.enumeration(Arrays.asList(streams))), allowBadIndexes);
         }
 
         return null;
     }
 
-    private ICC_Profile readICCProfileSafe(final InputStream stream, final boolean allowBadProfile, final int iccSize, final int iccChunkDataSize) throws IOException {
-        if (iccSize < 0 || iccSize > iccChunkDataSize) {
-            processWarningOccurred(String.format("Truncated 'ICC_PROFILE' chunk(s), size: %d. Ignoring ICC profile.", iccSize));
-            return null;
-        }
-
+    private ICC_Profile readICCProfileSafe(final InputStream stream, final boolean allowBadProfile) {
         try {
-            ICC_Profile profile = ICC_Profile.getInstance(stream);
-
             // NOTE: Need to ensure we have a display profile *before* validating, for the caching to work
-            return allowBadProfile ? profile : ColorSpaces.validateProfile(ensureDisplayProfile(profile));
+            return allowBadProfile ? ColorProfiles.readProfileRaw(stream) : ensureDisplayProfile(ColorProfiles.readProfile(stream));
         }
-        catch (RuntimeException e) {
+        catch (IOException | RuntimeException e) {
             // NOTE: Throws either IllegalArgumentException or CMMException, depending on platform.
             // Usual reason: Broken tools store truncated ICC profiles in a single ICC_PROFILE chunk...
             processWarningOccurred(String.format("Bad 'ICC_PROFILE' chunk(s): %s. Ignoring ICC profile.", e.getMessage()));
@@ -1169,7 +1150,7 @@ public final class JPEGImageReader extends ImageReaderBase {
         processThumbnailStarted(imageIndex, thumbnailIndex);
         processThumbnailProgress(0f);
 
-        BufferedImage thumbnail = thumbnails.get(thumbnailIndex).read();;
+        BufferedImage thumbnail = thumbnails.get(thumbnailIndex).read();
 
         processThumbnailProgress(100f);
         processThumbnailComplete();
@@ -1211,7 +1192,7 @@ public final class JPEGImageReader extends ImageReaderBase {
 
         for (int y = 0; y < height; y++) {
             for (int x = 0; x < width; x++) {
-                YCbCrConverter.convertYCbCr2RGB(data, data, (x + y * width) * numComponents);
+                YCbCrConverter.convertJPEGYCbCr2RGB(data, data, (x + y * width) * numComponents);
             }
         }
     }
@@ -1225,7 +1206,7 @@ public final class JPEGImageReader extends ImageReaderBase {
             for (int x = 0; x < width; x++) {
                 int offset = (x + y * width) * 4;
                 // YCC -> CMY
-                YCbCrConverter.convertYCbCr2RGB(data, data, offset);
+                YCbCrConverter.convertJPEGYCbCr2RGB(data, data, offset);
                 // Inverse K
                 data[offset + 3] = (byte) (0xff - data[offset + 3] & 0xff);
             }

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

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

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

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

imageio/imageio-metadata/pom.xml

@@ -3,7 +3,7 @@
     <parent>
 	<groupId>com.twelvemonkeys.imageio</groupId>        
 	<artifactId>imageio</artifactId>        
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>imageio-metadata</artifactId>

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

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

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

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

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

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

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

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

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java

@@ -30,6 +30,7 @@
 
 package com.twelvemonkeys.imageio.metadata.jpeg;
 
+import com.twelvemonkeys.imageio.color.ColorProfiles;
 import com.twelvemonkeys.imageio.metadata.Directory;
 import com.twelvemonkeys.imageio.metadata.Entry;
 import com.twelvemonkeys.imageio.metadata.psd.PSD;
@@ -42,7 +43,6 @@ import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
-import java.awt.color.ICC_ColorSpace;
 import java.awt.color.ICC_Profile;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
@@ -353,8 +353,8 @@ public final class JPEGSegmentUtil {
                     Directory psd = new PSDReader().read(stream);
                     Entry iccEntry = psd.getEntryById(PSD.RES_ICC_PROFILE);
                     if (iccEntry != null) {
-                        ICC_ColorSpace colorSpace = new ICC_ColorSpace(ICC_Profile.getInstance((byte[]) iccEntry.getValue()));
-                        System.err.println("colorSpace: " + colorSpace);
+                        ICC_Profile profile = ColorProfiles.createProfile((byte[]) iccEntry.getValue());
+                        System.err.println("ICC Profile: " + profile);
                     }
                     System.err.println("PSD: " + psd);
                     System.err.println(TIFFReader.HexDump.dump(segment.data));

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

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

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

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

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPReader.java

@@ -30,11 +30,21 @@
 
 package com.twelvemonkeys.imageio.metadata.xmp;
 
-import com.twelvemonkeys.imageio.metadata.Directory;
-import com.twelvemonkeys.imageio.metadata.Entry;
-import com.twelvemonkeys.imageio.metadata.MetadataReader;
-import com.twelvemonkeys.imageio.util.IIOUtil;
-import com.twelvemonkeys.lang.Validate;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.imageio.IIOException;
+import javax.imageio.stream.ImageInputStream;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -43,13 +53,11 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import javax.imageio.IIOException;
-import javax.imageio.stream.ImageInputStream;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.util.*;
+import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.MetadataReader;
+import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.lang.Validate;
 
 /**
  * XMPReader
@@ -67,10 +75,9 @@ public final class XMPReader extends MetadataReader {
     public Directory read(final ImageInputStream input) throws IOException {
         Validate.notNull(input, "input");
 
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-
         try {
+            DocumentBuilderFactory factory = createDocumentBuilderFactory();
+
             // TODO: Consider parsing using SAX?
             // TODO: Determine encoding and parse using a Reader...
             // TODO: Refactor scanner to return inputstream?
@@ -79,9 +86,6 @@ public final class XMPReader extends MetadataReader {
             builder.setErrorHandler(new DefaultHandler());
             Document document = builder.parse(new InputSource(IIOUtil.createStreamAdapter(input)));
 
-//            XMLSerializer serializer = new XMLSerializer(System.err, System.getProperty("file.encoding"));
-//            serializer.serialize(document);
-
             String toolkit = getToolkit(document);
             Node rdfRoot = document.getElementsByTagNameNS(XMP.NS_RDF, "RDF").item(0);
             NodeList descriptions = document.getElementsByTagNameNS(XMP.NS_RDF, "Description");
@@ -92,10 +96,33 @@ public final class XMPReader extends MetadataReader {
             throw new IIOException(e.getMessage(), e);
         }
         catch (ParserConfigurationException e) {
-            throw new RuntimeException(e); // TODO: Or IOException?
+            throw new RuntimeException(e);
         }
     }
 
+    private DocumentBuilderFactory createDocumentBuilderFactory() throws ParserConfigurationException {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+
+        // Security: Disable XInclude & expanding entity references ("bombs"), not needed for XMP
+        factory.setXIncludeAware(false);
+        factory.setExpandEntityReferences(false);
+
+        // Security: Enable "secure processing", to prevent DoS attacks
+        factory.setAttribute(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+
+        // Security: Remove possibility to access external DTDs or Schema, not needed for XMP
+        factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+        factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+
+        // Security: Disable loading of external DTD and entities, not needed for XMP
+        factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+
+        return factory;
+    }
+
     private String getToolkit(Document document) {
         NodeList xmpmeta = document.getElementsByTagNameNS(XMP.NS_X, "xmpmeta");
 
@@ -109,7 +136,7 @@ public final class XMPReader extends MetadataReader {
     }
 
     private XMPDirectory parseDirectories(final Node pParentNode, NodeList pNodes, String toolkit) {
-        Map<String, List<Entry>> subdirs = new LinkedHashMap<String, List<Entry>>();
+        Map<String, List<Entry>> subdirs = new LinkedHashMap<>();
 
         for (Node desc : asIterable(pNodes)) {
             if (desc.getParentNode() != pParentNode) {
@@ -127,7 +154,7 @@ public final class XMPReader extends MetadataReader {
                 // Lookup
                 List<Entry> dir = subdirs.get(node.getNamespaceURI());
                 if (dir == null) {
-                    dir = new ArrayList<Entry>();
+                    dir = new ArrayList<>();
                     subdirs.put(node.getNamespaceURI(), dir);
                 }
 
@@ -139,7 +166,7 @@ public final class XMPReader extends MetadataReader {
                 else {
                     // TODO: This method contains loads of duplication an should be cleaned up...
                     // Support attribute short-hand syntax
-                    Map<String, List<Entry>> subsubdirs = new LinkedHashMap<String, List<Entry>>();
+                    Map<String, List<Entry>> subsubdirs = new LinkedHashMap<>();
 
                     parseAttributesForKnownElements(subsubdirs, node);
 
@@ -161,7 +188,7 @@ public final class XMPReader extends MetadataReader {
             }
         }
 
-        List<Directory> entries = new ArrayList<Directory>(subdirs.size());
+        List<Directory> entries = new ArrayList<>(subdirs.size());
 
         // TODO: Should we still allow asking for a subdirectory by item id?
         for (Map.Entry<String, List<Entry>> entry : subdirs.entrySet()) {
@@ -179,7 +206,7 @@ public final class XMPReader extends MetadataReader {
 
     private RDFDescription parseAsResource(Node node) {
         // See: http://www.w3.org/TR/REC-rdf-syntax/#section-Syntax-parsetype-resource
-        List<Entry> entries = new ArrayList<Entry>();
+        List<Entry> entries = new ArrayList<>();
 
         for (Node child : asIterable(node.getChildNodes())) {
             if (child.getNodeType() != Node.ELEMENT_NODE) {
@@ -204,7 +231,7 @@ public final class XMPReader extends MetadataReader {
             List<Entry> dir = subdirs.get(attr.getNamespaceURI());
 
             if (dir == null) {
-                dir = new ArrayList<Entry>();
+                dir = new ArrayList<>();
                 subdirs.put(attr.getNamespaceURI(), dir);
             }
 
@@ -216,7 +243,7 @@ public final class XMPReader extends MetadataReader {
         for (Node child : asIterable(node.getChildNodes())) {
             if (XMP.NS_RDF.equals(child.getNamespaceURI()) && "Alt".equals(child.getLocalName())) {
                 // Support for <rdf:Alt><rdf:li> -> return a Map<String, Object> keyed on xml:lang
-                Map<String, Object> alternatives = new LinkedHashMap<String, Object>();
+                Map<String, Object> alternatives = new LinkedHashMap<>();
                 for (Node alternative : asIterable(child.getChildNodes())) {
                     if (XMP.NS_RDF.equals(alternative.getNamespaceURI()) && "li".equals(alternative.getLocalName())) {
                         NamedNodeMap attributes = alternative.getAttributes();
@@ -230,7 +257,7 @@ public final class XMPReader extends MetadataReader {
             else if (XMP.NS_RDF.equals(child.getNamespaceURI()) && ("Seq".equals(child.getLocalName()) || "Bag".equals(child.getLocalName()))) {
                 // Support for <rdf:Seq><rdf:li> -> return array
                 // Support for <rdf:Bag><rdf:li> -> return array/unordered collection (how can a serialized collection not have order?)
-                List<Object> seq = new ArrayList<Object>();
+                List<Object> seq = new ArrayList<>();
 
                 for (Node sequence : asIterable(child.getChildNodes())) {
                     if (XMP.NS_RDF.equals(sequence.getNamespaceURI()) && "li".equals(sequence.getLocalName())) {

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

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

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

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

imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/xmp/XMPReaderTest.java

@@ -30,26 +30,32 @@
 
 package com.twelvemonkeys.imageio.metadata.xmp;
 
-import com.twelvemonkeys.imageio.metadata.CompoundDirectory;
-import com.twelvemonkeys.imageio.metadata.Directory;
-import com.twelvemonkeys.imageio.metadata.Entry;
-import com.twelvemonkeys.imageio.metadata.MetadataReaderAbstractTest;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-import org.junit.Test;
-
-import javax.imageio.ImageIO;
-import javax.imageio.stream.ImageInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import javax.imageio.ImageIO;
+import javax.imageio.stream.ImageInputStream;
+
+import org.junit.Test;
+
+import com.twelvemonkeys.imageio.metadata.CompoundDirectory;
+import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.MetadataReaderAbstractTest;
 
 /**
  * XMPReaderTest
@@ -483,4 +489,69 @@ public class XMPReaderTest extends MetadataReaderAbstractTest {
         assertThat(exif.getEntryById("http://ns.adobe.com/exif/1.0/PixelYDimension"), hasValue("550"));
         assertThat(exif.getEntryById("http://ns.adobe.com/exif/1.0/NativeDigest"), hasValue("36864,40960,40961,37121,37122,40962,40963,37510,40964,36867,36868,33434,33437,34850,34852,34855,34856,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37396,41483,41484,41486,41487,41488,41492,41493,41495,41728,41729,41730,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,42016,0,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,26,27,28,30;A7F21D25E2C562F152B2C4ECC9E534DA"));
     }
+
+    @Test(timeout = 1500L)
+    public void testNoExternalRequest() throws Exception {
+        // TODO: Use dynamic port?
+        try (HTTPServer server = new HTTPServer(7777)) {
+            try {
+                createReader().read(getResourceAsIIS("/xmp/xmp-jpeg-xxe.xml"));
+            } catch (IOException ioe) {
+                if (ioe.getMessage().contains("501")) {
+                    throw new AssertionError("Reading should not cause external requests", ioe);
+                }
+
+                // Any other exception is a bug (but might happen if the parser does not support certain features)
+                throw ioe;
+            }
+        }
+    }
+
+    private static class HTTPServer implements AutoCloseable {
+        private final ServerSocket server;
+        private final Thread thread;
+
+        HTTPServer(int port) throws IOException {
+            server = new ServerSocket(port, 1);
+            thread = new Thread(new Runnable() {
+                @Override public void run() {
+                    serve();
+                }
+            });
+            thread.start();
+        }
+
+        private void serve() {
+            try {
+                Socket client = server.accept();
+
+                // Get the input stream, don't care about the request
+                try (InputStream inputStream = client.getInputStream()) {
+                    while (inputStream.available() > 0) {
+                        if (inputStream.read() == -1) {
+                            break;
+                        }
+                    }
+
+                    // Answer with 501, this will cause the client to throw IOException
+                    try (OutputStream outputStream = client.getOutputStream()) {
+                        outputStream.write("HTTP/1.0 501 Not Implemented\r\n\r\n".getBytes(StandardCharsets.UTF_8));
+                    }
+                }
+            }
+            catch (IOException e) {
+                if (server.isClosed() && e instanceof SocketException) {
+                    // Socket closed due to server close, all good
+                    return;
+                }
+
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override public void close() throws Exception {
+            server.close();
+            thread.join(); // It's advised against throwing InterruptedException here, but this is not production code...
+        }
+    }
 }

imageio/imageio-metadata/src/test/resources/xmp/xmp-jpeg-xxe.xml

@@ -0,0 +1,35 @@
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?><!DOCTYPE root [<!ENTITY % ext SYSTEM 'http://localhost:7777/xxx'> %ext;]>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Image::ExifTool 10.16'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+
+ <rdf:Description rdf:about=''
+  xmlns:xmpMM='http://ns.adobe.com/xap/1.0/mm/'>
+  <xmpMM:InstanceID>xmp.iid:7EDC21BF-371B-4189-90AF-C83A54A6A190</xmpMM:InstanceID>
+ </rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+<?xpacket end='w'?>

imageio/imageio-pcx/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-pcx</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PCX plugin</name>

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

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

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

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

imageio/imageio-pdf/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-pdf</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PDF plugin</name>

imageio/imageio-pict/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-pict</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PICT plugin</name>

imageio/imageio-pnm/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-pnm</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PNM plugin</name>

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

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

imageio/imageio-psd/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-psd</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PSD plugin</name>

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

@@ -30,9 +30,11 @@
 
 package com.twelvemonkeys.imageio.plugins.psd;
 
+import com.twelvemonkeys.imageio.color.ColorProfiles;
 import com.twelvemonkeys.imageio.util.IIOUtil;
 
 import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
 import java.awt.color.ICC_Profile;
 import java.io.IOException;
 import java.io.InputStream;
@@ -52,14 +54,23 @@ final class ICCProfile extends PSDImageResource {
     }
 
     @Override
-    protected void readData(ImageInputStream pInput) throws IOException {
-        InputStream stream = IIOUtil.createStreamAdapter(pInput, size);
-        try {
-            profile = ICC_Profile.getInstance(stream);
+    protected void readData(final ImageInputStream pInput) throws IOException {
+        try (InputStream stream = IIOUtil.createStreamAdapter(pInput, size)) {
+            profile = ColorProfiles.readProfileRaw(stream);
         }
-        finally {
-            // Make sure stream has correct position after read
-            stream.close();
+    }
+
+    static void writeData(final ImageOutputStream output, final ICC_Profile profile) throws IOException {
+        output.writeInt(PSD.RESOURCE_TYPE);
+        output.writeShort(PSD.RES_ICC_PROFILE);
+        output.writeShort(0); // Zero-length Pascal name + pad
+
+        byte[] data = profile.getData();
+        output.writeInt(data.length + data.length % 2);
+        output.write(data);
+
+        if (data.length % 2 != 0) {
+            output.write(0); // pad
         }
     }
 

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

@@ -31,11 +31,16 @@
 package com.twelvemonkeys.imageio.plugins.psd;
 
 import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.Entry;
 import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFFWriter;
 import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
+import com.twelvemonkeys.imageio.stream.SubImageOutputStream;
 
 import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
 import java.io.IOException;
+import java.util.Collection;
 
 /**
  * EXIF metadata.
@@ -60,6 +65,27 @@ final class PSDEXIF1Data extends PSDDirectoryResource {
         return new TIFFReader().read(new ByteArrayImageInputStream(data));
     }
 
+    static void writeData(final ImageOutputStream output, final Collection<? extends Entry> directory) throws IOException {
+        output.writeInt(PSD.RESOURCE_TYPE);
+        output.writeShort(PSD.RES_EXIF_DATA_1);
+        output.writeShort(0); // Zero-length Pascal name + pad
+        output.writeInt(0); // Dummy length
+
+        long beforeExif = output.getStreamPosition();
+        new TIFFWriter().write(directory, new SubImageOutputStream(output));
+
+        long afterExif = output.getStreamPosition();
+        if ((afterExif - beforeExif) % 2 != 0) {
+            afterExif++;
+            output.write(0); // Pad
+        }
+
+        // Update length
+        output.seek(beforeExif - 4);
+        output.writeInt((int) (afterExif - beforeExif));
+        output.seek(afterExif);
+    }
+
     @Override
     public String toString() {
         Directory directory = getDirectory();

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

@@ -31,6 +31,7 @@
 package com.twelvemonkeys.imageio.plugins.psd;
 
 import javax.imageio.IIOException;
+import javax.imageio.stream.ImageOutputStream;
 import java.io.DataInput;
 import java.io.IOException;
 
@@ -57,8 +58,8 @@ final class PSDHeader {
 //       WORD Mode;           /* Color mode */
 //    } PSD_HEADER;
 
-    private static final int PSD_MAX_SIZE = 30000;
-    private static final int PSB_MAX_SIZE = 300000;
+    static final int PSD_MAX_SIZE = 30000;
+    static final int PSB_MAX_SIZE = 300000;
 
     final short channels;
     final int width;
@@ -67,7 +68,57 @@ final class PSDHeader {
     final short mode;
     final boolean largeFormat;
 
-    PSDHeader(final DataInput pInput) throws IOException {
+    PSDHeader(int channels, int width, int height, int bits, int mode, boolean largeFormat) {
+        this((short) channels, width, height, (short) bits, (short) mode, largeFormat);
+    }
+
+    private PSDHeader(short channels, int width, int height, short bits, short mode, boolean largeFormat) {
+        if (channels < 1 || channels > 56) {
+            throw new IllegalArgumentException(String.format("Unsupported number of channels for PSD: %d", channels));
+        }
+        this.channels = channels;
+
+        this.width = width;
+        this.height = height;
+
+        switch (bits) {
+            case 1:
+            case 8:
+            case 16:
+            case 32:
+                break;
+            default:
+                throw new IllegalArgumentException(String.format("Unsupported bit depth for PSD: %d bits", bits));
+        }
+
+        this.bits = bits;
+
+        switch (mode) {
+            case PSD.COLOR_MODE_BITMAP:
+            case PSD.COLOR_MODE_GRAYSCALE:
+            case PSD.COLOR_MODE_INDEXED:
+            case PSD.COLOR_MODE_RGB:
+            case PSD.COLOR_MODE_CMYK:
+            case PSD.COLOR_MODE_MULTICHANNEL:
+            case PSD.COLOR_MODE_DUOTONE:
+            case PSD.COLOR_MODE_LAB:
+                break;
+            default:
+                throw new IllegalArgumentException(String.format("Unsupported color mode for PSD: %d", mode));
+        }
+
+        this.mode = mode;
+
+        this.largeFormat = largeFormat;
+
+        if (!hasValidDimensions()) {
+            throw new IllegalArgumentException(String.format("Dimensions exceed maximum allowed for %s: %dx%d (max %dx%d)",
+                    largeFormat ? "PSB" : "PSD",
+                    width, height, getMaxSize(), getMaxSize()));
+        }
+    }
+
+    static PSDHeader read(final DataInput pInput) throws IOException {
         int signature = pInput.readInt();
         if (signature != PSD.SIGNATURE_8BPS) {
             throw new IIOException("Not a PSD document, expected signature \"8BPS\": \"" + PSDUtil.intToStr(signature) + "\" (0x" + Integer.toHexString(signature) + ")");
@@ -75,6 +126,7 @@ final class PSDHeader {
 
         int version = pInput.readUnsignedShort();
 
+        boolean largeFormat;
         switch (version) {
             case PSD.VERSION_PSD:
                 largeFormat = false;
@@ -89,15 +141,15 @@ final class PSDHeader {
         byte[] reserved = new byte[6];
         pInput.readFully(reserved); // We don't really care
 
-        channels = pInput.readShort();
+        short channels = pInput.readShort();
         if (channels < 1 || channels > 56) {
             throw new IIOException(String.format("Unsupported number of channels for PSD: %d", channels));
         }
 
-        height = pInput.readInt(); // Rows
-        width = pInput.readInt(); // Columns
+        int height = pInput.readInt(); // Rows
+        int width = pInput.readInt();  // Columns
 
-        bits = pInput.readShort();
+        short bits = pInput.readShort();
 
         switch (bits) {
             case 1:
@@ -109,7 +161,7 @@ final class PSDHeader {
                 throw new IIOException(String.format("Unsupported bit depth for PSD: %d bits", bits));
         }
 
-        mode = pInput.readShort();
+        short mode = pInput.readShort();
 
         switch (mode) {
             case PSD.COLOR_MODE_BITMAP:
@@ -124,6 +176,21 @@ final class PSDHeader {
             default:
                 throw new IIOException(String.format("Unsupported color mode for PSD: %d", mode));
         }
+
+        return new PSDHeader(channels, width, height, bits, mode, largeFormat);
+    }
+
+    void write(ImageOutputStream output) throws IOException {
+        output.writeInt(PSD.SIGNATURE_8BPS);
+        output.writeShort(largeFormat ? PSD.VERSION_PSB : PSD.VERSION_PSD);
+
+        output.write(new byte[6]); // Reserved
+
+        output.writeShort(channels);
+        output.writeInt(height); // Columns
+        output.writeInt(width);  // Rows
+        output.writeShort(bits);
+        output.writeShort(mode);
     }
 
     @Override
@@ -177,4 +244,5 @@ final class PSDHeader {
                 return "Unkown mode";
         }
     }
+
 }

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

@@ -331,7 +331,7 @@ public final class PSDImageReader extends ImageReaderBase {
                 // Just stick to the raw type
         }
 
-        // Finally add the raw type
+        // Finally, add the raw type
         types.add(rawType);
 
         return types.iterator();
@@ -842,7 +842,7 @@ public final class PSDImageReader extends ImageReaderBase {
         assertInput();
 
         if (header == null) {
-            header = new PSDHeader(imageInput);
+            header = PSDHeader.read(imageInput);
 
             if (!header.hasValidDimensions()) {
                 processWarningOccurred(String.format("Dimensions exceed maximum allowed for %s: %dx%d (max %dx%d)",
@@ -930,13 +930,12 @@ public final class PSDImageReader extends ImageReaderBase {
 
             // NOTE: The spec says that if this section is empty, the length should be 0.
             // Yet I have a PSB file that has size 12, and both contained lengths set to 0 (which
-            // is alo not as per spec, as layer count should be included if there's a layer info
+            // is also not as per spec, as layer count should be included if there's a layer info
             // block, so minimum size should be either 0 or 14 (or 16 if multiple of 4 for PSB))...
 
             if (layerAndMaskInfoLength > 0) {
                 long pos = imageInput.getStreamPosition();
 
-                //if (metadata.layerInfo == null) {
                 long layerInfoLength = header.largeFormat ? imageInput.readLong() : imageInput.readUnsignedInt();
 
                 if (layerInfoLength > 0) {
@@ -991,7 +990,6 @@ public final class PSDImageReader extends ImageReaderBase {
                     System.out.println("layerInfo: " + metadata.layerInfo);
                     System.out.println("globalLayerMask: " + (metadata.globalLayerMask != PSDGlobalLayerMask.NULL_MASK ? metadata.globalLayerMask : null));
                 }
-                //}
             }
 
             metadata.imageDataStart = metadata.layerAndMaskInfoStart + layerAndMaskInfoLength + (header.largeFormat ? 8 : 4);

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

@@ -69,12 +69,10 @@ final public class PSDImageReaderSpi extends ImageReaderSpiBase {
                 switch (version) {
                     case PSD.VERSION_PSD:
                     case PSD.VERSION_PSB:
-                        break;
+                        return true;
                     default:
-                        return false;
+                        // Fall through
                 }
-
-                return true;
             }
 
             return false;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Harald Kuhr
+ * Copyright (c) 2021, Harald Kuhr
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,36 +28,42 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.twelvemonkeys.servlet.image.aoi;
+package com.twelvemonkeys.imageio.plugins.psd;
 
-import java.util.concurrent.atomic.AtomicReference;
+import javax.imageio.ImageWriteParam;
+import java.util.Locale;
 
 /**
- * @author <a href="mailto:erlend@escenic.com">Erlend Hamnaberg</a>
- * @version $Revision: $
+ * PSDImageWriteParam
  */
-public class AreaOfInterestFactory {
-    private final static AtomicReference<AreaOfInterestFactory> DEFAULT =
-            new AtomicReference<AreaOfInterestFactory>(new AreaOfInterestFactory());
+public final class PSDImageWriteParam extends ImageWriteParam {
 
-    public static void setDefault(AreaOfInterestFactory factory) {
-        DEFAULT.set(factory);
+    PSDImageWriteParam() {
+        this(Locale.getDefault());
     }
 
-    public static AreaOfInterestFactory getDefault() {
-        return DEFAULT.get();
+    PSDImageWriteParam(final Locale locale) {
+        super(locale);
+
+        compressionTypes = new String[] {
+                "None",
+                "PackBits",
+                // Two ZIP compression types are defined in spec, never seen in the wild...
+                // "ZIP",
+                // "ZIP+Predictor",
+        };
+        compressionType = compressionTypes[1];
+        canWriteCompressed = true;
     }
 
-    public AreaOfInterest createAreaOfInterest(int pDefaultWidth, int pDefaultHeight, boolean aoiPercent, boolean aoiUniform) {
-        if (aoiPercent && aoiUniform) {
-            throw new IllegalArgumentException("Cannot be both uniform and percent Area of Interest");
+    static int getCompressionType(final ImageWriteParam param) {
+        if (param == null || param.getCompressionMode() != MODE_EXPLICIT || param.getCompressionType() == null || param.getCompressionType().equals("None")) {
+            return PSD.COMPRESSION_NONE;
         }
-        if (aoiPercent) {
-            return new PercentAreaOfInterest(pDefaultWidth, pDefaultHeight);
+        else if (param.getCompressionType().equals("PackBits")) {
+            return PSD.COMPRESSION_RLE;
         }
-        else if (aoiUniform) {
-            return new UniformAreaOfInterest(pDefaultWidth, pDefaultHeight);
-        }
-        return new DefaultAreaOfInterest(pDefaultWidth, pDefaultHeight);
+
+        throw new IllegalArgumentException(String.format("Unsupported compression type: %s", param.getCompressionType()));
     }
 }

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

@@ -0,0 +1,400 @@
+/*
+ * Copyright (c) 2021, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.psd;
+
+import com.twelvemonkeys.imageio.ImageWriterBase;
+import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
+import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.imageio.util.RasterUtils;
+import com.twelvemonkeys.io.enc.EncoderStream;
+import com.twelvemonkeys.io.enc.PackBitsEncoder;
+
+import javax.imageio.*;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.spi.ImageWriterSpi;
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_ColorSpace;
+import java.awt.color.ICC_Profile;
+import java.awt.image.*;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteOrder;
+import java.util.Collections;
+
+/**
+ * Minimal ImageWriter for Adobe Photoshop Document (PSD) format.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: PSDImageWriter.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>
+ */
+public final class PSDImageWriter extends ImageWriterBase  {
+
+    PSDImageWriter(ImageWriterSpi provider) {
+        super(provider);
+    }
+
+    @Override
+    public IIOMetadata getDefaultImageMetadata(ImageTypeSpecifier imageType, ImageWriteParam param) {
+        // TODO: Implement
+        return null;
+    }
+
+    @Override
+    public IIOMetadata convertImageMetadata(IIOMetadata inData, ImageTypeSpecifier imageType, ImageWriteParam param) {
+        // TODO: Implement
+        return null;
+    }
+
+    @Override
+    public ImageWriteParam getDefaultWriteParam() {
+        return new PSDImageWriteParam(getLocale());
+    }
+
+    @Override
+    public void write(IIOMetadata streamMetadata, IIOImage iioImage, ImageWriteParam param) throws IOException {
+        assertOutput();
+        imageOutput.setByteOrder(ByteOrder.BIG_ENDIAN);
+
+        RenderedImage image = iioImage.getRenderedImage();
+        SampleModel sampleModel = image.getSampleModel();
+
+        int colorComponents = image.getColorModel().getColorSpace().getNumComponents();
+        int channels = sampleModel.getNumBands();
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        int bits = getBitsPerSample(sampleModel);
+        int mode = getColorMode(image.getColorModel());
+        // TODO: Allow stream metadata or param to force PSD/PSB (version 1/2)?
+        boolean largeFormat = width > PSDHeader.PSD_MAX_SIZE || height > PSDHeader.PSD_MAX_SIZE;
+
+        new PSDHeader(channels, width, height, bits, mode, largeFormat).write(imageOutput);
+        writeColorModeData(image, mode);
+        writeImageResources(image, mode);
+
+        // Length of the layer and mask information section. (**PSB** length is 8 bytes.)
+        // TODO: Write an empty dummy layer here, if there's alpha? See below... Or see if Photoshop handles alpha if no layers at all...
+        if (largeFormat) {
+            imageOutput.writeLong(0);
+        }
+        else {
+            imageOutput.writeInt(0);
+        }
+
+        processImageStarted(0);
+
+        // Image Data Section (composite layer only).
+        // The last section of a Photoshop file contains the image pixel data.
+        // Image data is stored in planar order: first all the red data, then all the green data, etc.
+        // Each plane is stored in scan-line order, with no pad bytes,
+        final int compression = PSDImageWriteParam.getCompressionType(param);
+        imageOutput.writeShort(compression);
+
+        long byteCountPos = imageOutput.getStreamPosition();
+        // PSB (large format) byte counts are actually 32 bit offsets, not 16 bit as described in spec
+        int[] byteCounts = new int[compression == PSD.COMPRESSION_RLE ? height * channels : 0];
+        imageOutput.skipBytes(byteCounts.length * (largeFormat ? 4 : 2));
+
+        // TODO: Loop over tiles?
+        Raster tile = sampleModel.getTransferType() == DataBuffer.TYPE_INT && sampleModel instanceof SinglePixelPackedSampleModel
+                      ? RasterUtils.asByteRaster(image.getTile(0, 0))
+                      : image.getTile(0, 0);
+
+        for (int channel = 0; channel < channels; channel++) {
+            // TODO: Alpha issues:
+            //  1. Alpha channel is written (but not read, because there are no layers, and alpha is considered present only if layer count is negative)
+            //     - Can we write a small hidden layer, just to have -1 layers?
+            //  2. Alpha needs to be premultiplied against white background (to avoid inverse halo)
+            Raster channelRaster = tile.createChild(0, 0, width, height, 0, 0, new int[] {channel});
+
+            switch (bits) {
+                case 1:
+                    // TODO: Figure out why we can't write multi-pixel packed 1 bit samples as bytes...
+                case 8:
+                    write8BitChannel(channel, colorComponents, mode, compression, channelRaster, byteCounts);
+                    break;
+                case 16:
+                    write16BitChannel(channel, colorComponents, mode, compression, channelRaster, byteCounts);
+                    break;
+                case 32:
+                    write32BitChannel(channel, colorComponents, mode, compression, channelRaster, byteCounts);
+                    break;
+                default:
+                    throw new AssertionError(); // Should be guarded against already
+            }
+
+            processImageProgress(channel * 100f / channels);
+        }
+
+        updateByteCounts(byteCountPos, byteCounts, largeFormat);
+
+        processImageComplete();
+    }
+
+    private void updateByteCounts(long byteCountPos, int[] byteCounts, boolean largeFormat) throws IOException {
+        if (byteCounts.length == 0) {
+            return;
+        }
+
+        // Update byte counts for RLE
+        long pos = imageOutput.getStreamPosition();
+
+        imageOutput.seek(byteCountPos);
+        if (largeFormat) {
+            imageOutput.writeInts(byteCounts, 0, byteCounts.length);
+        }
+        else {
+            for (int byteCount : byteCounts) {
+                imageOutput.writeShort(byteCount);
+            }
+        }
+
+        imageOutput.seek(pos);
+    }
+
+    private void writeColorModeData(RenderedImage image, int mode) throws IOException {
+        if (mode == PSD.COLOR_MODE_INDEXED) {
+            IndexColorModel icm = (IndexColorModel) image.getColorModel();
+
+            // Indexed color images: length is 768; color data contains the color table for the image, in non-interleaved order.
+            imageOutput.writeInt(768);
+            byte[] colors = new byte[256];
+
+            icm.getReds(colors);
+            imageOutput.write(colors);
+            icm.getGreens(colors);
+            imageOutput.write(colors);
+            icm.getBlues(colors);
+            imageOutput.write(colors);
+        }
+        else {
+            imageOutput.writeInt(0);
+        }
+    }
+
+    private void writeImageResources(RenderedImage image, int mode) throws IOException {
+        // Length of image resource section. The length may be zero
+        imageOutput.writeInt(0);
+        long startImageResources  = imageOutput.getStreamPosition();
+
+        // Write ICC color profile if not "native" sRGB or gray (or bitmap/indexed)
+        if (mode != PSD.COLOR_MODE_BITMAP && mode != PSD.COLOR_MODE_INDEXED) {
+            ColorSpace colorSpace = image.getColorModel().getColorSpace();
+            if (!colorSpace.isCS_sRGB() && colorSpace instanceof ICC_ColorSpace) {
+                ICC_Profile profile = ((ICC_ColorSpace) colorSpace).getProfile();
+                ICCProfile.writeData(imageOutput, profile);
+            }
+        }
+
+        // Write creator software (Exif)
+        Entry software = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO PSD writer " + originatingProvider.getVersion());
+        PSDEXIF1Data.writeData(imageOutput, Collections.singleton(software));
+
+        long endImageResources = imageOutput.getStreamPosition();
+
+        // Update image resources length
+        imageOutput.seek(startImageResources - 4);
+        imageOutput.writeInt((int) (endImageResources - startImageResources));
+        imageOutput.seek(endImageResources);
+    }
+
+    private void write8BitChannel(int channel, int colorComponents, int colorMode, int compression, Raster raster, int[] byteCounts) throws IOException {
+        int width = raster.getWidth();
+        int height = raster.getHeight();
+
+        byte[] rowBytes = null;
+
+        for (int y = 0; y < height; y++) {
+            rowBytes = (byte[]) raster.getDataElements(0, y, width, 1, rowBytes);
+
+            // Photoshop likes to store CMYK values inverted (but not the alpha value)
+            if (colorMode == PSD.COLOR_MODE_CMYK && channel < colorComponents) {
+                for (int i = 0; i < rowBytes.length; i++) {
+                    rowBytes[i] = (byte) (0xff - rowBytes[i] & 0xff);
+                }
+            }
+
+            if (compression == PSD.COMPRESSION_NONE) {
+                imageOutput.write(rowBytes);
+            }
+            else if (compression == PSD.COMPRESSION_RLE) {
+                long startPos = imageOutput.getStreamPosition();
+
+                // The RLE compressed data follows, with each scan line compressed separately
+                try (OutputStream stream = new EncoderStream(IIOUtil.createStreamAdapter(imageOutput), new PackBitsEncoder())) {
+                    stream.write(rowBytes);
+                }
+
+                long endPos = imageOutput.getStreamPosition();
+                byteCounts[y + channel * height] = (int) (endPos - startPos);
+            }
+            else {
+                throw new IIOException("PSD with ZIP compression not supported");
+            }
+        }
+    }
+
+    private void write16BitChannel(int channel, int colorComponents, int colorMode, int compression, Raster raster, int[] byteCounts) throws IOException {
+        int width = raster.getWidth();
+        int height = raster.getHeight();
+
+        short[] row = null;
+
+        for (int y = 0; y < height; y++) {
+            row = (short[]) raster.getDataElements(0, y, width, 1, row);
+
+            // Photoshop likes to store CMYK values inverted (but not the alpha value)
+            if (colorMode == PSD.COLOR_MODE_CMYK && channel < colorComponents) {
+                for (int i = 0; i < row.length; i++) {
+                    row[i] = (short) (0xffff - row[i] & 0xffff);
+                }
+            }
+
+            if (compression == PSD.COMPRESSION_NONE) {
+                imageOutput.writeShorts(row, 0, row.length);
+            }
+            else if (compression == PSD.COMPRESSION_RLE) {
+                long startPos = imageOutput.getStreamPosition();
+
+                // The RLE compressed data follows, with each scan line compressed separately
+                try (DataOutputStream stream = new DataOutputStream(new EncoderStream(IIOUtil.createStreamAdapter(imageOutput), new PackBitsEncoder()))) {
+                    for (short sample : row) {
+                        stream.writeShort(sample);
+                    }
+                }
+
+                long endPos = imageOutput.getStreamPosition();
+                byteCounts[y + channel * height] = (int) (endPos - startPos);
+            }
+            else {
+                throw new IIOException("PSD with ZIP compression not supported");
+            }
+        }
+    }
+
+    private void write32BitChannel(int channel, int colorComponents, int colorMode, int compression, Raster raster, int[] byteCounts) throws IOException {
+        int width = raster.getWidth();
+        int height = raster.getHeight();
+
+        int[] row = null;
+
+        for (int y = 0; y < height; y++) {
+            row = (int[]) raster.getDataElements(0, y, width, 1, row);
+
+            // Photoshop likes to store CMYK values inverted (but not the alpha value)
+            if (colorMode == PSD.COLOR_MODE_CMYK && channel < colorComponents) {
+                for (int i = 0; i < row.length; i++) {
+                    row[i] = 0xffffffff - row[i];
+                }
+            }
+
+            if (compression == PSD.COMPRESSION_NONE) {
+                imageOutput.writeInts(row, 0, row.length);
+            }
+            else if (compression == PSD.COMPRESSION_RLE) {
+                long startPos = imageOutput.getStreamPosition();
+
+                // The RLE compressed data follows, with each scan line compressed separately
+                try (DataOutputStream stream = new DataOutputStream(new EncoderStream(IIOUtil.createStreamAdapter(imageOutput), new PackBitsEncoder()))) {
+                    for (int sample : row) {
+                        stream.writeInt(sample);
+                    }
+                }
+
+                long endPos = imageOutput.getStreamPosition();
+                byteCounts[y + channel * height] = (int) (endPos - startPos);
+            }
+            else {
+                throw new IIOException("PSD with ZIP compression not supported");
+            }
+        }
+    }
+
+    static int getColorMode(ColorModel colorModel) {
+        if (colorModel instanceof IndexColorModel) {
+            if (colorModel.getPixelSize() == 1) {
+                return PSD.COLOR_MODE_BITMAP;
+            }
+            else {
+                return PSD.COLOR_MODE_INDEXED;
+            }
+        }
+
+        int csType = colorModel.getColorSpace().getType();
+        switch (csType) {
+            case ColorSpace.TYPE_GRAY:
+                if (colorModel.getPixelSize() == 1) {
+                    return PSD.COLOR_MODE_BITMAP;
+                }
+                else {
+                    return PSD.COLOR_MODE_GRAYSCALE;
+                }
+            case ColorSpace.TYPE_RGB:
+                return PSD.COLOR_MODE_RGB;
+            case ColorSpace.TYPE_CMYK:
+                return PSD.COLOR_MODE_CMYK;
+            default:
+                throw new IllegalArgumentException("Unsupported color space type for PSD:  " + csType);
+        }
+    }
+
+    static int getBitsPerSample(SampleModel sampleModel) {
+        int bits = sampleModel.getSampleSize(0);
+
+        for (int i = 1; i < sampleModel.getNumBands(); i++) {
+            if (bits != sampleModel.getSampleSize(i)) {
+                throw new IllegalArgumentException("All samples must be of equal size for PSD: " + bits);
+            }
+        }
+
+        switch (bits) {
+            case 1:
+            case 8:
+            case 16:
+            case 32:
+                return (short) bits;
+            default:
+                throw new IllegalArgumentException("Unsupported sample size for PSD (expected 1, 8, 16 or 32): " + bits);
+        }
+    }
+
+    public static void main(String[] args) throws IOException {
+        BufferedImage image = ImageIO.read(new File(args[0]));
+        ImageIO.write(image, "PSD", new File("test.psd"));
+    }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Harald Kuhr
+ * Copyright (c) 2021, Harald Kuhr
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,49 +28,50 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.twelvemonkeys.servlet.cache;
+package com.twelvemonkeys.imageio.plugins.psd;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
+import com.twelvemonkeys.imageio.spi.ImageWriterSpiBase;
+
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.ImageWriter;
+import java.util.Locale;
+
+import static com.twelvemonkeys.imageio.plugins.psd.PSDImageWriter.getBitsPerSample;
+import static com.twelvemonkeys.imageio.plugins.psd.PSDImageWriter.getColorMode;
 
 /**
- * ServletCacheResponse
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: ServletCacheResponse.java#2 $
+ * PSDImageWriterSpi
  */
-public final class ServletCacheResponse extends AbstractCacheResponse {
-    private HttpServletResponse response;
+public final class PSDImageWriterSpi extends ImageWriterSpiBase {
 
-    public ServletCacheResponse(HttpServletResponse pResponse) {
-        response = pResponse;
-    }
-
-    public OutputStream getOutputStream() throws IOException {
-        return response.getOutputStream();
+    public PSDImageWriterSpi() {
+        super(new PSDProviderInfo());
     }
 
     @Override
-    public void setStatus(int pStatusCode) {
-        response.setStatus(pStatusCode);
-        super.setStatus(pStatusCode);
+    public boolean canEncodeImage(ImageTypeSpecifier type) {
+        // PSD supports:
+        //  - 1, 8, 16 or 32 bit/sample
+        //  - Number of samples <= 56
+        //  - RGB, CMYK, Gray, Indexed color
+        try {
+            getBitsPerSample(type.getSampleModel());
+            getColorMode(type.getColorModel());
+        }
+        catch (IllegalArgumentException ignore) {
+            // We can't write this type
+            return false;
+        }
+
+        return type.getNumBands() <= 56; // Can't be negative
     }
 
     @Override
-    public void addHeader(String pHeaderName, String pHeaderValue) {
-        response.addHeader(pHeaderName, pHeaderValue);
-        super.addHeader(pHeaderName, pHeaderValue);
+    public ImageWriter createWriterInstance(Object extension) {
+        return new PSDImageWriter(this);
     }
 
-    @Override
-    public void setHeader(String pHeaderName, String pHeaderValue) {
-        response.setHeader(pHeaderName, pHeaderValue);
-        super.setHeader(pHeaderName, pHeaderValue);
-    }
-
-    HttpServletResponse getResponse() {
-        return response;
+    public String getDescription(final Locale pLocale) {
+        return "Adobe Photoshop Document (PSD) image writer";
     }
 }

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

@@ -43,8 +43,8 @@ final class PSDProviderInfo extends ReaderWriterProviderInfo {
     protected PSDProviderInfo() {
         super(
                 PSDProviderInfo.class,
-                new String[] {"psd", "PSD"},
-                new String[] {"psd"},
+                new String[] {"psd", "PSD", "psb", "PSB"},
+                new String[] {"psd", "psb"},
                 new String[] {
                         "image/vnd.adobe.photoshop",        // Official, IANA registered
                         "application/vnd.adobe.photoshop",  // Used in XMP
@@ -54,8 +54,8 @@ final class PSDProviderInfo extends ReaderWriterProviderInfo {
                 },
                 "com.twelvemonkeys.imageio.plugins.psd.PSDImageReader",
                 new String[] {"com.twelvemonkeys.imageio.plugins.psd.PSDImageReaderSpi"},
-                null,
-                null, // new String[] {"com.twelvemonkeys.imageio.plugins.psd.PSDImageWriterSpi"},
+                "com.twelvemonkeys.imageio.plugins.psd.PSDImageWriter",
+                new String[] {"com.twelvemonkeys.imageio.plugins.psd.PSDImageWriterSpi"},
                 false, null, null, null, null,
                 true, PSDMetadata.NATIVE_METADATA_FORMAT_NAME, PSDMetadata.NATIVE_METADATA_FORMAT_CLASS_NAME, null, null
         );

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

@@ -67,7 +67,7 @@ final class PSDVersionInfo extends PSDImageResource {
 
         writer = PSDUtil.readUnicodeString(pInput);
         reader = PSDUtil.readUnicodeString(pInput);
-        
+
         fileVersion = pInput.readInt();
     }
 

imageio/imageio-psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi

@@ -0,0 +1 @@
+com.twelvemonkeys.imageio.plugins.psd.PSDImageWriterSpi

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

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

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

@@ -0,0 +1,37 @@
+package com.twelvemonkeys.imageio.plugins.psd;
+
+import com.twelvemonkeys.imageio.util.ImageWriterAbstractTest;
+
+import javax.imageio.spi.ImageWriterSpi;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * PSDImageWriterTest.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: PSDImageWriterTest.java,v 1.0 05/05/2021 haraldk Exp$
+ */
+public class PSDImageWriterTest extends ImageWriterAbstractTest<PSDImageWriter> {
+    @Override
+    protected ImageWriterSpi createProvider() {
+        return new PSDImageWriterSpi();
+    }
+
+    @Override
+    protected List<? extends RenderedImage> getTestData() {
+        return Arrays.asList(
+                new BufferedImage(300, 200, BufferedImage.TYPE_INT_RGB),
+                new BufferedImage(301, 199, BufferedImage.TYPE_INT_ARGB),
+                new BufferedImage(299, 201, BufferedImage.TYPE_3BYTE_BGR),
+                new BufferedImage(160, 90, BufferedImage.TYPE_4BYTE_ABGR),
+                new BufferedImage(90, 160, BufferedImage.TYPE_BYTE_GRAY),
+                new BufferedImage(30, 20, BufferedImage.TYPE_USHORT_GRAY),
+                new BufferedImage(30, 20, BufferedImage.TYPE_BYTE_BINARY),
+                new BufferedImage(30, 20, BufferedImage.TYPE_BYTE_INDEXED)
+        );
+    }
+}

imageio/imageio-reference/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-reference</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JDK Reference Tests</name>
@@ -16,6 +16,18 @@
         <project.jpms.module.name>com.twelvemonkeys.imageio.reference</project.jpms.module.name>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>

imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java

@@ -46,6 +46,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static com.twelvemonkeys.imageio.util.IIOUtil.lookupProviderByName;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * JPEGImageReaderTest
@@ -89,24 +90,16 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
     @Override
     public void testSetDestination() throws IOException {
         // Known bug in Sun JPEGImageReader before Java 6
-        if (IS_JAVA_6_OR_LATER) {
-            super.testSetDestination();
-        }
-        else {
-            System.err.println("WARNING: Test skipped due to known bug in Java 1.5, please test again with Java 6 or later");
-        }
+        assumeTrue("Test skipped due to known bug in Java 1.5, please test again with Java 6 or later", IS_JAVA_6_OR_LATER);
+        super.testSetDestination();
     }
 
     @Test
     @Override
     public void testSetDestinationType() throws IOException {
         // Known bug in Sun JPEGImageReader before Java 6
-        if (IS_JAVA_6_OR_LATER) {
-            super.testSetDestinationType();
-        }
-        else {
-            System.err.println("WARNING: Test skipped due to known bug in Java 1.5, please test again with Java 6 or later");
-        }
+        assumeTrue("Test skipped due to known bug in Java 1.5, please test again with Java 6 or later", IS_JAVA_6_OR_LATER);
+        super.testSetDestinationType();
     }
 
     @Test

imageio/imageio-sgi/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
     </parent>
     <artifactId>imageio-sgi</artifactId>
     <name>TwelveMonkeys :: ImageIO :: SGI plugin</name>