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

[maven-release-plugin] prepare release twelvemonkeys-3.6.4
#595 Avoid infinite loop on corrupted JPEG stream
2026-05-20 00:00:03 -04:00 · 2021-03-08 14:31:07 +01:00 · 2021-03-08 14:31:01 +01:00 · 2021-03-08 14:24:12 +01:00 · 2021-03-08 14:24:11 +01:00 · 2021-03-08 14:23:19 +01:00
556 changed files with 45435 additions and 21202 deletions
@@ -1 +0,0 @@
-github: haraldk
@@ -1,53 +0,0 @@
---
-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.
@@ -1,20 +0,0 @@
---
-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.
@@ -1,13 +0,0 @@
---
-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.
@@ -1,11 +0,0 @@
-**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 
@@ -1,90 +0,0 @@
-name: CI
-
-on: [ push, pull_request ]
-
-jobs:
-  test:
-    name: Test OpenJDK ${{ matrix.java }} on ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        java: [ 8, 11, 17 ]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-          java-package: jdk
-          cache: 'maven'
-      - name: Run Tests
-        run: mvn test
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v2
-        if: ${{ !cancelled() }}
-        with:
-          report_paths: "**/target/surefire-reports/TEST*.xml"
-          check_name: Unit Test Results for OpenJDK ${{ matrix.java }} on ${{ matrix.os }}
-
-  test_oracle:
-    name: Test Oracle JDK 8 with KCMS=${{ matrix.kcms }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        kcms: [ true, false ]
-    steps:
-      - uses: actions/checkout@v2
-      - run: |
-          download_url="https://javadl.oracle.com/webapps/download/AutoDL?BundleId=245038_d3c52aa6bfa54d3ca74e617f18309292"
-          wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'jdkfile'
-          jdkFile: ${{ runner.temp }}/java_package.tar.gz
-          java-version: '8'
-          cache: 'maven'
-      - name: Set MAVEN_OPTS
-        if: ${{ matrix.kcms }}
-        run: |
-          echo "MAVEN_OPTS=-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider" >> $GITHUB_ENV
-      - name: Display Java version
-        run: java -version
-      - name: Run Tests
-        run: mvn test
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v2
-        if: ${{ !cancelled() }}
-        with:
-          report_paths: "**/target/surefire-reports/TEST*.xml"
-          check_name: Unit Test Results for Oracle JDK 8 with KCMS=${{ matrix.kcms }}
-
-  release:
-    name: Deploy
-    needs: [ test, test_oracle ]
-    if: github.ref == 'refs/heads/master' # only perform on latest master
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Maven Central
-        uses: actions/setup-java@v2
-        with: # running setup-java again overwrites the settings.xml
-          distribution: 'temurin'
-          java-version: '8'
-          java-package: jdk
-          server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
-          server-username: MAVEN_CENTRAL_USERNAME # env variable for username in deploy (1)
-          server-password: MAVEN_CENTRAL_PASSWORD # env variable for token in deploy (2)
-          gpg-private-key: ${{ secrets.GPG_KEY }} # Value of the GPG private key to import
-          gpg-passphrase: MAVEN_CENTRAL_GPG_PASSPHRASE # env variable for GPG private key passphrase (3)
-      - name: Get Project Version
-        run: |
-          echo "PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
-      - name: Publish to Maven Central
-        if: ${{ endsWith(env.PROJECT_VERSION, '-SNAPSHOT') }}
-        run: mvn deploy -P release -DskipTests
-        env:
-          MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }} # must be the same env variable name as (1)
-          MAVEN_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} # must be the same env variable name as (2)
-          MAVEN_CENTRAL_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} # must be the same env variable name as (3)
@@ -0,0 +1,14 @@
+dist: trusty
+language: java
+jdk:
+  - oraclejdk8
+# Oracle JDK 7 no longer supported, we use env matrix to test various CMM providers
+#  - oraclejdk7
+# Some JPEGImageReader tests fail on OpenJDK, need to investigate/fix before enabling
+#  - openjdk7
+env:
+  - MAVEN_OPTS=-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider
+  - MAVEN_OPTS=""
+cache:
+  directories:
+  - $HOME/.m2
@@ -1,55 +1,56 @@
-[![CI](https://github.com/haraldk/TwelveMonkeys/actions/workflows/ci.yml/badge.svg)](https://github.com/haraldk/TwelveMonkeys/actions/workflows/ci.yml)
-[![Maven Central](https://img.shields.io/maven-central/v/com.twelvemonkeys.imageio/imageio?color=slateblue)](https://search.maven.org/search?q=g:com.twelvemonkeys.imageio)
-[![Maven Snapshot](https://img.shields.io/nexus/s/com.twelvemonkeys.imageio/imageio?label=development&server=https%3A%2F%2Foss.sonatype.org&color=slateblue)](https://oss.sonatype.org/content/repositories/snapshots/com/twelvemonkeys/)
+[![Build Status](https://travis-ci.org/haraldk/TwelveMonkeys.svg?branch=master)](https://travis-ci.org/haraldk/TwelveMonkeys) 
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.twelvemonkeys.imageio/imageio/badge.svg?color=slateblue)](https://maven-badges.herokuapp.com/maven-central/com.twelvemonkeys.imageio/imageio)
 [![StackOverflow](https://img.shields.io/badge/stack_overflow-twelvemonkeys-orange.svg)](https://stackoverflow.com/questions/tagged/twelvemonkeys)
 [![Donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://paypal.me/haraldk76/100)

 ## About

-TwelveMonkeys ImageIO provides extended image file format support for the Java platform, through plugins for the `javax.imageio.*` package.
+TwelveMonkeys ImageIO is a collection of plugins and extensions for Java's ImageIO.

-The main goal of this project is to provide support for formats not covered by the JRE itself. 
-Support for these formats is important, to be able to read data found
+These plugins extend the number of image file formats supported in Java, using the `javax.imageio.*` package.
+The main purpose of this project is to provide support for formats not covered by the JRE itself.
+
+Support for formats is important, both to be able to read data found
 "in the wild", as well as to maintain access to data in legacy formats.
-As there is lots of legacy data out there, we see the need for open implementations of readers for popular formats.
+Because there is lots of legacy data out there, we see the need for open implementations of readers for popular formats.
+The goal is to create a set of efficient and robust ImageIO plug-ins, that can be distributed independently.

 ----

 ## File formats supported

-| Plugin | Format   | Description                                             | R |  W  | Metadata | Notes |
-| ------ | -------- |---------------------------------------------------------|:---:|:---:| -------- | ----- |
-| Batik  | **SVG**  | Scalable Vector Graphics                                | ✔ |  -  | - | Requires [Batik](https://xmlgraphics.apache.org/batik/) |
-|        | WMF      | MS Windows Metafile                                     | ✔ |  -  | - | Requires [Batik](https://xmlgraphics.apache.org/batik/) |
-| [BMP](https://github.com/haraldk/TwelveMonkeys/wiki/BMP-Plugin)    | **BMP**  | MS Windows and IBM OS/2 Device Independent Bitmap       | ✔  |  ✔  | [Native](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/bmp_metadata.html), [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |
-|        | CUR      | MS Windows Cursor Format                                | ✔  |  -  | - |
-|        | ICO      | MS Windows Icon Format                                  | ✔  |  ✔  | - | 
-| [HDR](https://github.com/haraldk/TwelveMonkeys/wiki/HDR-Plugin)    | HDR      | Radiance High Dynamic Range RGBE Format                 | ✔  |  -  | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-| [ICNS](https://github.com/haraldk/TwelveMonkeys/wiki/ICNS-Plugin)   | ICNS     | Apple Icon Image                                        | ✔  |  ✔  | -  | 
-| [IFF](https://github.com/haraldk/TwelveMonkeys/wiki/IFF-Plugin)    | IFF      | Commodore Amiga/Electronic Arts Interchange File Format | ✔  |  ✔  | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-| [JPEG](https://github.com/haraldk/TwelveMonkeys/wiki/JPEG-Plugin)   | **JPEG** | Joint Photographers Expert Group                        | ✔  |  ✔  | [Native](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/jpeg_metadata.html#image), [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-|   | JPEG Lossless |                                                         | ✔  |  -  | [Native](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/jpeg_metadata.html#image), [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-| [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) | 
-| [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) |  
-|        |  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) |  
-| 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) | 
+| Plugin | Format   | Description           | Read | Write | Metadata | Notes |
+| ------ | -------- | -----------           |:----:|:-----:| -------- | ----- |
+| Batik  | **SVG**  | Scalable Vector Graphics | ✔ |  -  | - | Requires [Batik](https://xmlgraphics.apache.org/batik/)
+|        | WMF      | MS Windows Metafile      | ✔ |  -  | - | Requires [Batik](https://xmlgraphics.apache.org/batik/)
+| [BMP](https://github.com/haraldk/TwelveMonkeys/wiki/BMP-Plugin)    | **BMP**  | MS Windows and IBM OS/2 Device Independent Bitmap | ✔  | ✔   | Native & Standard |
+|        | CUR      | MS Windows Cursor Format  | ✔  | -   | - |
+|        | ICO      | MS Windows Icon Format    | ✔  | ✔   | - | 
+| [HDR](https://github.com/haraldk/TwelveMonkeys/wiki/HDR-Plugin)    | HDR      | Radiance High Dynamic Range RGBE Format | ✔  | - | Standard | 
+| [ICNS](https://github.com/haraldk/TwelveMonkeys/wiki/ICNS-Plugin)   | ICNS     | Apple Icon Image | ✔  | ✔   | -  | 
+| [IFF](https://github.com/haraldk/TwelveMonkeys/wiki/IFF-Plugin)    | IFF      | Commodore Amiga/Electronic Arts Interchange File Format | ✔  | ✔   | Standard | 
+| [JPEG](https://github.com/haraldk/TwelveMonkeys/wiki/JPEG-Plugin)   | **JPEG** | Joint Photographers Expert Group | ✔  | ✔   | Native & Standard | 
+|   | **JPEG Lossless** |   | ✔  |  -  | Native & Standard | 
+| [PCX](https://github.com/haraldk/TwelveMonkeys/wiki/PCX-Plugin)    | PCX      | ZSoft Paintbrush Format | ✔  | -  | Standard | 
+|        | DCX      | Multi-page PCX fax document | ✔  | -   | Standard | 
+| [PICT](https://github.com/haraldk/TwelveMonkeys/wiki/PICT-Plugin)   | PICT     | Apple Mac Paint Picture Format | ✔  | -   | - | 
+| [PNM](https://github.com/haraldk/TwelveMonkeys/wiki/PNM-Plugin)    | PAM      | NetPBM Portable Any Map | ✔  | ✔   | Standard | 
+|        | PBM      | NetPBM Portable Bit Map | ✔  | -     | Standard | 
+|        | PGM      | NetPBM Portable Grey Map | ✔  | -   | Standard | 
+|        | PPM      | NetPBM Portable Pix Map | ✔  | ✔   | Standard | 
+|        | PFM      | Portable Float Map | ✔  | -   | Standard | 
+| [PSD](https://github.com/haraldk/TwelveMonkeys/wiki/PSD-Plugin)    | **PSD**  | Adobe Photoshop Document | ✔  | - | Native & Standard |  
+|        |  PSB     | Adobe Photoshop Large Document | ✔  | - | Native & Standard | 
+| [SGI](https://github.com/haraldk/TwelveMonkeys/wiki/SGI-Plugin)    | SGI      | Silicon Graphics Image Format  | ✔  | -   | Standard | 
+| [TGA](https://github.com/haraldk/TwelveMonkeys/wiki/TGA-Plugin)    | TGA      | Truevision TGA Image Format  | ✔  | ✔   | Standard | 
+|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 & Standard | 
+|        | BigTIFF  |  | ✔  | - | Native & Standard |  
+| [WebP](https://github.com/haraldk/TwelveMonkeys/wiki/WebP-Plugin)   | **WebP** | Google WebP Format | ✔  | - | Standard |  In progress
+| XWD    | XWD      | X11 Window Dump Format | ✔  | -   | Standard | 


-**Important note on using Batik:** *Please read [The Apache™ XML Graphics Project - Security](https://xmlgraphics.apache.org/security.html), 
+**Important note on using Batik:** *Please read [The Apache™ XML Graphics Project - Security](http://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
@@ -164,7 +165,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](https://docs.oracle.com/javase/7/docs/technotes/guides/imageio/spec/imageio_guideTOC.fm.html)
+[Java Image I/O API Guide](http://docs.oracle.com/javase/7/docs/technotes/guides/imageio/spec/imageio_guideTOC.fm.html)
 from Oracle.

 #### Adobe Clipping Path support
@@ -218,14 +219,14 @@ BufferedImage output = ditherer.filter(input, null);

 ## Building

-Download the project (using [Git](https://git-scm.com/downloads)):
+Download the project (using [Git](http://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](https://maven.apache.org/download.cgi)):
+Build the project (using [Maven](http://maven.apache.org/download.cgi)):

    $ mvn package

@@ -272,12 +273,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.8.1</version>
+        <version>3.6.3</version>
    </dependency>
    <dependency>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio-tiff</artifactId>
-        <version>3.8.1</version>
+        <version>3.6.3</version>
    </dependency>

    <!--
@@ -287,17 +288,7 @@ 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.8.1</version>
-    </dependency>
-
-    <!--
-    Or Jakarta version, for Servlet API 5.0
-    -->
-    <dependency>
-        <groupId>com.twelvemonkeys.servlet</groupId>
-        <artifactId>servlet</artifactId>
-        <version>3.8.1</version>
-        <classifier>jakarta</classifier>
+        <version>3.6.3</version>
    </dependency>
 </dependencies>
 ```
@@ -306,13 +297,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.8.1.jar
-    twelvemonkeys-common-io-3.8.1.jar
-    twelvemonkeys-common-image-3.8.1.jar
-    twelvemonkeys-imageio-core-3.8.1.jar
-    twelvemonkeys-imageio-metadata-3.8.1.jar
-    twelvemonkeys-imageio-jpeg-3.8.1.jar
-    twelvemonkeys-imageio-tiff-3.8.1.jar
+    twelvemonkeys-common-lang-3.6.3.jar
+    twelvemonkeys-common-io-3.6.3.jar
+    twelvemonkeys-common-image-3.6.3.jar
+    twelvemonkeys-imageio-core-3.6.3.jar
+    twelvemonkeys-imageio-metadata-3.6.3.jar
+    twelvemonkeys-imageio-jpeg-3.6.3.jar
+    twelvemonkeys-imageio-tiff-3.6.3.jar

 #### Deploying the plugins in a web app

@@ -378,79 +369,77 @@ Other "fat" JAR bundlers will probably have similar mechanisms to merge entries

 ### Links to prebuilt binaries

-##### Latest version (3.8.1)
+##### Latest version (3.6.3)

 Requires Java 7 or later.
 
 Common dependencies
-* [common-lang-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.8.1/common-lang-3.8.1.jar)
-* [common-io-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.8.1/common-io-3.8.1.jar)
-* [common-image-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.8.1/common-image-3.8.1.jar)
+* [common-lang-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.6.3/common-lang-3.6.3.jar)
+* [common-io-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.6.3/common-io-3.6.3.jar)
+* [common-image-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.6.3/common-image-3.6.3.jar)

 ImageIO dependencies
-* [imageio-core-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.8.1/imageio-core-3.8.1.jar)
-* [imageio-metadata-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.8.1/imageio-metadata-3.8.1.jar)
+* [imageio-core-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.6.3/imageio-core-3.6.3.jar)
+* [imageio-metadata-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.6.3/imageio-metadata-3.6.3.jar)

 ImageIO plugins
-* [imageio-bmp-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.8.1/imageio-bmp-3.8.1.jar)
-* [imageio-hdr-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.8.1/imageio-hdr-3.8.1.jar)
-* [imageio-icns-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.8.1/imageio-icns-3.8.1.jar)
-* [imageio-iff-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.8.1/imageio-iff-3.8.1.jar)
-* [imageio-jpeg-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.8.1/imageio-jpeg-3.8.1.jar)
-* [imageio-pcx-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.8.1/imageio-pcx-3.8.1.jar)
-* [imageio-pict-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.8.1/imageio-pict-3.8.1.jar)
-* [imageio-pnm-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.8.1/imageio-pnm-3.8.1.jar)
-* [imageio-psd-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.8.1/imageio-psd-3.8.1.jar)
-* [imageio-sgi-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.8.1/imageio-sgi-3.8.1.jar)
-* [imageio-tga-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.8.1/imageio-tga-3.8.1.jar)
-* [imageio-thumbsdb-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.8.1/imageio-thumbsdb-3.8.1.jar)
-* [imageio-tiff-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.8.1/imageio-tiff-3.8.1.jar)
-* [imageio-webp-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-webp/3.8.1/imageio-webp-3.8.1.jar)
-* [imageio-xwd-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-xwd/3.8.1/imageio-xwd-3.8.1.jar)
+* [imageio-bmp-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.6.3/imageio-bmp-3.6.3.jar)
+* [imageio-hdr-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.6.3/imageio-hdr-3.6.3.jar)
+* [imageio-icns-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.6.3/imageio-icns-3.6.3.jar)
+* [imageio-iff-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.6.3/imageio-iff-3.6.3.jar)
+* [imageio-jpeg-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.6.3/imageio-jpeg-3.6.3.jar)
+* [imageio-pcx-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.6.3/imageio-pcx-3.6.3.jar)
+* [imageio-pict-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.6.3/imageio-pict-3.6.3.jar)
+* [imageio-pnm-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.6.3/imageio-pnm-3.6.3.jar)
+* [imageio-psd-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.6.3/imageio-psd-3.6.3.jar)
+* [imageio-sgi-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.6.3/imageio-sgi-3.6.3.jar)
+* [imageio-tga-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.6.3/imageio-tga-3.6.3.jar)
+* [imageio-thumbsdb-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.6.3/imageio-thumbsdb-3.6.3.jar)
+* [imageio-tiff-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.6.3/imageio-tiff-3.6.3.jar)

 ImageIO plugins requiring 3rd party libs
-* [imageio-batik-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.8.1/imageio-batik-3.8.1.jar)
+* [imageio-batik-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.6.3/imageio-batik-3.6.3.jar)

 Photoshop Path support for ImageIO
-* [imageio-clippath-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.8.1/imageio-clippath-3.8.1.jar)
+* [imageio-clippath-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.6.3/imageio-clippath-3.6.3.jar)

 Servlet support
-* [servlet-3.8.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.8.1/servlet-3.8.1.jar)
+* [servlet-3.6.3.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.6.3/servlet-3.6.3.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](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)
+* [common-lang-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.0.2/common-lang-3.0.2.jar)
+* [common-io-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.0.2/common-io-3.0.2.jar)
+* [common-image-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.0.2/common-image-3.0.2.jar)
 
 ImageIO dependencies
-* [imageio-core-3.0.2.jar](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-core-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.0.2/imageio-core-3.0.2.jar)
+* [imageio-metadata-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.0.2/imageio-metadata-3.0.2.jar)
 
 ImageIO plugins
-* [imageio-jpeg-3.0.2.jar](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-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 plugins requiring 3rd party libs
-* [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)
+* [imageio-batik-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.0.2/imageio-batik-3.0.2.jar)
+* [imageio-jmagick-3.0.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jmagick/3.0.2/imageio-jmagick-3.0.2.jar)
 
 Servlet support
-* [servlet-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.0.2/servlet-3.0.2.jar)
+* [servlet-3.0.2.jar](http://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](https://opensource.org/licenses/BSD-3-Clause):
+This project is provided under the OSI approved [BSD license](http://opensource.org/licenses/BSD-3-Clause):

    Copyright (c) 2008-2020, Harald Kuhr
    All rights reserved.
@@ -505,7 +494,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](https://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](http://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
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>

    <groupId>com.twelvemonkeys.bom</groupId>
@@ -123,11 +123,6 @@
                <artifactId>imageio-tiff</artifactId>
                <version>${project.version}</version>
            </dependency>
-            <dependency>
-                <groupId>com.twelvemonkeys.imageio</groupId>
-                <artifactId>imageio-webp</artifactId>
-                <version>${project.version}</version>
-            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-xwd</artifactId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>common-image</artifactId>
    <packaging>jar</packaging>
@@ -13,10 +13,6 @@
        The TwelveMonkeys Common Image support
    </description>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.common.image</project.jpms.module.name>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>${project.groupId}</groupId>
@@ -34,13 +34,7 @@ import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ColorModel;
-import java.awt.image.ImagingOpException;
-import java.awt.image.Raster;
-import java.awt.image.RasterOp;
-import java.awt.image.WritableRaster;
+import java.awt.image.*;

 /**
 * This is a drop-in replacement for {@link java.awt.image.AffineTransformOp}.
@@ -76,7 +70,6 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
        delegate = new java.awt.image.AffineTransformOp(xform, interpolationType);
    }

-    @SuppressWarnings("ConstantConditions")
    @Override
    public BufferedImage filter(final BufferedImage src, BufferedImage dst) {
        try {
@@ -87,9 +80,10 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
                dst = createCompatibleDestImage(src, src.getColorModel());
            }

-            Graphics2D g2d = dst.createGraphics();
+            Graphics2D g2d = null;

            try {
+                g2d = dst.createGraphics();
                int interpolationType = delegate.getInterpolationType();

                if (interpolationType > 0) {
@@ -115,7 +109,9 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
                return dst;
            }
            finally {
-                g2d.dispose();
+                if (g2d != null) {
+                    g2d.dispose();
+                }
            }
        }
    }
@@ -45,8 +45,8 @@ import java.awt.image.BufferedImage;
 */
 public class BufferedImageIcon implements Icon {
    private final BufferedImage image;
-    private final int width;
-    private final int height;
+    private int width;
+    private int height;
    private final boolean fast;

    public BufferedImageIcon(BufferedImage pImage) {
@@ -81,10 +81,11 @@ public class BufferedImageIcon implements Icon {
        else {
            //System.out.println("Scaling using interpolation");
            Graphics2D g2 = (Graphics2D) g;
-            AffineTransform transform = AffineTransform.getTranslateInstance(x, y);
-            transform.scale(width / (double) image.getWidth(), height / (double) image.getHeight());
-            g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-            g2.drawImage(image, transform, null);
+            AffineTransform xform = AffineTransform.getTranslateInstance(x, y);
+            xform.scale(width / (double) image.getWidth(), height / (double) image.getHeight());
+            g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+                                RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+            g2.drawImage(image, xform, null);
        }
    }
 }
@@ -587,7 +587,6 @@ class IndexImage {
     * @deprecated Use {@link #getIndexColorModel(Image,int,int)} instead!
     *             This version will be removed in a later version of the API.
     */
-    @Deprecated
    public static IndexColorModel getIndexColorModel(Image pImage, int pNumberOfColors, boolean pFast) {
        return getIndexColorModel(pImage, pNumberOfColors, pFast ? COLOR_SELECTION_FAST : COLOR_SELECTION_QUALITY);
    }
@@ -30,26 +30,17 @@

 package com.twelvemonkeys.image;

-import static java.lang.Math.min;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import org.junit.Test;

+import javax.imageio.ImageTypeSpecifier;
 import java.awt.color.ColorSpace;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.DataBuffer;
-import java.awt.image.ImagingOpException;
-import java.awt.image.Raster;
-import java.awt.image.RasterOp;
+import java.awt.image.*;
 import java.util.Arrays;
 import java.util.List;

-import javax.imageio.ImageTypeSpecifier;
-
-import org.junit.Test;
+import static org.junit.Assert.*;

 /**
 * AffineTransformOpTest.
@@ -110,7 +101,6 @@ public class AffineTransformOpTest {

    private final int width = 30;
    private final int height = 20;
-    private final double anchor = min(width, height) / 2.0;

    @Test
    public void testGetPoint2D() {
@@ -138,8 +128,8 @@ public class AffineTransformOpTest {

    @Test
    public void testFilterRotateBIStandard() {
-        BufferedImageOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
-        BufferedImageOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
+        BufferedImageOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
+        BufferedImageOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);

        for (Integer type : TYPES) {
            BufferedImage image = new BufferedImage(width, height, type);
@@ -157,8 +147,8 @@ public class AffineTransformOpTest {

    @Test
    public void testFilterRotateBICustom() {
-        BufferedImageOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
-        BufferedImageOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
+        BufferedImageOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
+        BufferedImageOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);

        for (ImageTypeSpecifier spec : SPECS) {
            BufferedImage image = spec.createBufferedImage(width, height);
@@ -207,8 +197,8 @@ public class AffineTransformOpTest {

    @Test
    public void testFilterRotateRasterStandard() {
-        RasterOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
-        RasterOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
+        RasterOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
+        RasterOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);

        for (Integer type : TYPES) {
            Raster raster = new BufferedImage(width, height, type).getRaster();
@@ -231,6 +221,8 @@ public class AffineTransformOpTest {
                    fail("No result!");
                }
                else {
+                    System.err.println("AffineTransformOpTest.testFilterRotateRasterStandard");
+                    System.err.println("type: " + type);
                    continue;
                }
            }
@@ -248,8 +240,8 @@ public class AffineTransformOpTest {

    @Test
    public void testFilterRotateRasterCustom() {
-        RasterOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
-        RasterOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, anchor, anchor), null);
+        RasterOp jreOp = new java.awt.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);
+        RasterOp tmOp = new com.twelvemonkeys.image.AffineTransformOp(AffineTransform.getQuadrantRotateInstance(1, Math.min(width, height) / 2, Math.min(width, height) / 2), null);

        for (ImageTypeSpecifier spec : SPECS) {
            Raster raster = spec.createBufferedImage(width, height).getRaster();
@@ -272,6 +264,8 @@ public class AffineTransformOpTest {
                    fail("No result!");
                }
                else {
+                    System.err.println("AffineTransformOpTest.testFilterRotateRasterCustom");
+                    System.err.println("spec: " + spec);
                    continue;
                }
            }
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>common-io</artifactId>
    <packaging>jar</packaging>
@@ -13,10 +13,6 @@
        The TwelveMonkeys Common IO support
    </description>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.common.io</project.jpms.module.name>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>${project.groupId}</groupId>
@@ -346,7 +346,7 @@ public final class FileUtil {

    /**
     * Gets the file (type) extension of the given file.
-     * A file extension is the part of the filename, after the last occurrence
+     * A file extension is the part of the filename, after the last occurence
     * of a period {@code '.'}.
     * If the filename contains no period, {@code null} is returned.
     *
@@ -65,7 +65,6 @@ import java.io.FilenameFilter;
 * @see WildcardStringParser
 * @deprecated
 */
-@Deprecated
 public class FilenameMaskFilter implements FilenameFilter {

     // TODO: Rewrite to use regexp, or create new class
@@ -442,7 +442,6 @@ public class LittleEndianDataInputStream extends FilterInputStream implements Da
     * @see        java.io.BufferedReader#readLine()
     * @see        java.io.DataInputStream#readLine()
     */
-    @Deprecated
    public String readLine() throws IOException {
        DataInputStream ds = new DataInputStream(in);
        return ds.readLine();
@@ -29,9 +29,6 @@

 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;
@@ -41,6 +38,9 @@ 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,6 +88,17 @@ 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.
@@ -158,7 +169,13 @@ public final class DOMSerializer {
            try {
                return DOMImplementationRegistry.newInstance();
            }
-            catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+            catch (ClassNotFoundException e) {
+                throw new IllegalStateException(e);
+            }
+            catch (InstantiationException e) {
+                throw new IllegalStateException(e);
+            }
+            catch (IllegalAccessException e) {
                throw new IllegalStateException(e);
            }
        }
@@ -30,23 +30,16 @@

 package com.twelvemonkeys.xml;

-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 com.twelvemonkeys.lang.StringUtil;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;

 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.*;
-import org.xml.sax.SAXException;
-
-import com.twelvemonkeys.lang.StringUtil;
+import java.io.*;
+import java.nio.charset.Charset;
+import java.util.Date;

 /**
 * XMLSerializer
@@ -297,7 +290,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, pStart, pEnd);
+        pBuilder.append(pString.substring(pStart, pEnd));
        pBuilder.append(pEntity);
        return pEnd + 1;
    }
@@ -534,7 +527,8 @@ public class XMLSerializer {
            builder = factory.newDocumentBuilder();
        }
        catch (ParserConfigurationException e) {
-            throw new IOException(e);
+            //noinspection ThrowableInstanceNeverThrown BOGUS
+            throw (IOException) new IOException(e.getMessage()).initCause(e);
        }

        DOMImplementation dom = builder.getDOMImplementation();
@@ -32,13 +32,13 @@ package com.twelvemonkeys.io.enc;

 import com.twelvemonkeys.io.FileUtil;
 import com.twelvemonkeys.lang.ObjectAbstractTest;
-
 import org.junit.Test;

 import java.io.*;
+import java.util.Arrays;
 import java.util.Random;

-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;

 /**
@@ -73,7 +73,7 @@ public abstract class EncoderAbstractTest extends ObjectAbstractTest {
        }
    }

-    private byte[] createData(final int pLength) {
+    private byte[] createData(final int pLength) throws Exception {
        byte[] bytes = new byte[pLength];
        RANDOM.nextBytes(bytes);
        return bytes;
@@ -82,8 +82,9 @@ public abstract class EncoderAbstractTest extends ObjectAbstractTest {
    private void runStreamTest(final int pLength) throws Exception {
        byte[] data = createData(pLength);
        ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
+        OutputStream out = new EncoderStream(outBytes, createEncoder(), true);

-        try (OutputStream out = new EncoderStream(outBytes, createEncoder(), true)) {
+        try {
            // Provoke failure for encoders that doesn't take array offset properly into account
            int off = (data.length + 1) / 2;
            out.write(data, 0, off);
@@ -91,6 +92,9 @@ public abstract class EncoderAbstractTest extends ObjectAbstractTest {
                out.write(data, off, data.length - off);
            }
        }
+        finally {
+            out.close();
+        }

        byte[] encoded = outBytes.toByteArray();

@@ -98,7 +102,7 @@ public abstract class EncoderAbstractTest extends ObjectAbstractTest {
 //        System.err.println("encoded: " + Arrays.toString(encoded));

        byte[] decoded = FileUtil.read(new DecoderStream(new ByteArrayInputStream(encoded), createCompatibleDecoder()));
-        assertArrayEquals(data, decoded);
+        assertTrue(Arrays.equals(data, decoded));

        InputStream in = new DecoderStream(new ByteArrayInputStream(encoded), createCompatibleDecoder());
        outBytes = new ByteArrayOutputStream();
@@ -112,7 +116,7 @@ public abstract class EncoderAbstractTest extends ObjectAbstractTest {
        }

        decoded = outBytes.toByteArray();
-        assertArrayEquals(data, decoded);
+        assertTrue(Arrays.equals(data, decoded));
    }

    @Test
@@ -125,6 +129,10 @@ public abstract class EncoderAbstractTest extends ObjectAbstractTest {
                e.printStackTrace();
                fail(e.getMessage() + ": " + i);
            }
+            catch (Exception e) {
+                e.printStackTrace();
+                fail(e.getMessage() + ": " + i);
+            }
        }

        for (int i = 100; i < 2000; i += 250) {
@@ -135,6 +143,10 @@ public abstract class EncoderAbstractTest extends ObjectAbstractTest {
                e.printStackTrace();
                fail(e.getMessage() + ": " + i);
            }
+            catch (Exception e) {
+                e.printStackTrace();
+                fail(e.getMessage() + ": " + i);
+            }
        }

        for (int i = 2000; i < 80000; i += 1000) {
@@ -145,8 +157,14 @@ public abstract class EncoderAbstractTest extends ObjectAbstractTest {
                e.printStackTrace();
                fail(e.getMessage() + ": " + i);
            }
+            catch (Exception e) {
+                e.printStackTrace();
+                fail(e.getMessage() + ": " + i);
+            }
        }
    }

-    // TODO: Test that the transition from byte[] to ByteBuffer didn't introduce bugs when writing to a wrapped array with offset.
+    // TODO: Test that the transition from byte[] to ByteBuffer didn't introduce bugs when writing to a wrapped array with offset.
+
+
 }
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>common-lang</artifactId>
    <packaging>jar</packaging>
@@ -13,8 +13,4 @@
        The TwelveMonkeys Common Language support
    </description>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.common.lang</project.jpms.module.name>
-    </properties>
-
 </project>
@@ -770,7 +770,6 @@ public final class StringUtil {
     */

    /*public*/
-    @Deprecated
    static String formatNumber(long pNum, int pLen) throws IllegalArgumentException {
        StringBuilder result = new StringBuilder();

@@ -1465,7 +1464,6 @@ public final class StringUtil {
     */

    /*public*/
-    @Deprecated
    static String removeSubstring(final String pSource, final char pBeginBoundaryChar, final char pEndBoundaryChar, final int pOffset) {
        StringBuilder filteredString = new StringBuilder();
        boolean insideDemarcatedArea = false;
@@ -330,7 +330,7 @@ abstract class AbstractDecoratedMap<K, V> extends AbstractMap<K, V> implements M
    }

    /**
-     * A simple Map.Entry implementation.
+     * A simple Map.Entry implementaton.
     */
    static class BasicEntry<K, V> implements Entry<K, V>, Serializable {
        K mKey;
@@ -157,7 +157,6 @@ public class Time {
     * @see #parseTime(String)
     * @deprecated
     */
-    @Deprecated
    public String toString(String pFormatStr) {
        TimeFormat tf = new TimeFormat(pFormatStr);

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

@@ -34,7 +34,7 @@ import java.io.Serializable;
 import java.util.*;

 /**
- * A {@code Map} implementation that removes (expires) its elements after
+ * A {@code Map} implementation that removes (exipres) its elements after
 * a given period. The map is by default backed by a {@link java.util.HashMap},
 * or can be instantiated with any given {@code Map} as backing.
 * <p>
@@ -67,7 +67,7 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi
    protected long expiryTime = 60000L;  // 1 minute

    //////////////////////
-    private volatile long nextExpiryTime = Long.MAX_VALUE;
+    private volatile long nextExpiryTime;
    //////////////////////

    /**
@@ -178,7 +178,7 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi
     * @return {@code true} if this map contains no key-value mappings.
     */
    public boolean isEmpty() {
-        return size() <= 0;
+        return (size() <= 0);
    }

    /**
@@ -208,7 +208,7 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi
     * @see #containsKey(java.lang.Object)
     */
    public V get(Object pKey) {
-        TimedEntry entry = (TimedEntry) entries.get(pKey);
+        TimedEntry<K, V> entry = (TimedEntry<K, V>) entries.get(pKey);

        if (entry == null) {
            return null;
@@ -236,7 +236,7 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi
     *         {@code null} values.
     */
    public V put(K pKey, V pValue) {
-        TimedEntry entry = (TimedEntry) entries.get(pKey);
+        TimedEntry<K, V> entry = (TimedEntry<K, V>) entries.get(pKey);
        V oldValue;

        if (entry == null) {
@@ -272,7 +272,7 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi
     *         {@code null} values.
     */
    public V remove(Object pKey) {
-        TimedEntry entry = (TimedEntry) entries.remove(pKey);
+        TimedEntry<K, V> entry = (TimedEntry<K, V>) entries.remove(pKey);
        return (entry != null) ? entry.getValue() : null;
    }

@@ -284,12 +284,13 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi
        init();
    }

-    /*protected*/ TimedEntry createEntry(K pKey, V pValue) {
-        return new TimedEntry(pKey, pValue);
+    /*protected*/ TimedEntry<K, V> createEntry(K pKey, V pValue) {
+        return new TimedEntry<K, V>(pKey, pValue);
    }

    /**
     * Removes any expired mappings.
+     *
     */
    protected void removeExpiredEntries() {
        // Remove any expired elements
@@ -311,7 +312,7 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi
            long next = Long.MAX_VALUE;
            nextExpiryTime = next; // Avoid multiple runs...
            for (Iterator<Entry<K, V>> iterator = new EntryIterator(); iterator.hasNext();) {
-                TimedEntry entry = (TimedEntry) iterator.next();
+                TimedEntry<K, V> entry = (TimedEntry<K, V>) iterator.next();
                ////
                long expires = entry.expires();
                if (expires < next) {
@@ -375,7 +376,7 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi

            while (mNext == null && mIterator.hasNext()) {
                Entry<K, Entry<K, V>> entry = mIterator.next();
-                TimedEntry timed = (TimedEntry) entry.getValue();
+                TimedEntry<K, V> timed = (TimedEntry<K, V>) entry.getValue();

                if (timed.isExpiredBy(mNow)) {
                    // Remove from map, and continue
@@ -424,26 +425,17 @@ public class TimeoutMap<K, V> extends AbstractDecoratedMap<K, V> implements Expi
    /**
     * Keeps track of timed objects
     */
-    private class TimedEntry extends BasicEntry<K, V> {
+    private class TimedEntry<K, V> extends BasicEntry<K, V> {
        private long mTimestamp;

        TimedEntry(K pKey, V pValue) {
            super(pKey, pValue);
-            updateTimestamp();
+            mTimestamp = System.currentTimeMillis();
        }

        public V setValue(V pValue) {
-            updateTimestamp();
-            return super.setValue(pValue);
-        }
-
-        private void updateTimestamp() {
            mTimestamp = System.currentTimeMillis();
-
-            long expires = expires();
-            if (expires < nextExpiryTime) {
-                nextExpiryTime = expires;
-            }
+            return super.setValue(pValue);
        }

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

@@ -30,7 +30,7 @@

 package com.twelvemonkeys.lang;

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

 import java.awt.*;
 import java.sql.Timestamp;
@@ -41,7 +41,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;

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

 /**
 * StringUtilTestCase
@@ -76,24 +76,24 @@ public class StringUtilTest {
        assertNull(StringUtil.valueOf(null));
    }

-    @SuppressWarnings("ConstantConditions")
    @Test
    public void testToUpperCase() {
        String str = StringUtil.toUpperCase(TEST_STRING);
        assertNotNull(str);
        assertEquals(TEST_STRING.toUpperCase(), str);

-        assertNull(StringUtil.toUpperCase(null));
+        str = StringUtil.toUpperCase(null);
+        assertNull(str);
    }

-    @SuppressWarnings("ConstantConditions")
    @Test
    public void testToLowerCase() {
        String str = StringUtil.toLowerCase(TEST_STRING);
        assertNotNull(str);
        assertEquals(TEST_STRING.toLowerCase(), str);

-        assertNull(StringUtil.toLowerCase(null));
+        str = StringUtil.toLowerCase(null);
+        assertNull(str);
    }

    @Test
@@ -113,7 +113,6 @@ public class StringUtilTest {
        assertFalse(StringUtil.isEmpty(new String[]{WHITESPACE_STRING, TEST_STRING}));
    }

-    @SuppressWarnings("ConstantConditions")
    @Test
    public void testContains() {
        assertTrue(StringUtil.contains(TEST_STRING, TEST_STRING));
@@ -146,7 +145,6 @@ public class StringUtilTest {
        assertFalse(StringUtil.containsIgnoreCase(null, null));
    }

-    @SuppressWarnings("ConstantConditions")
    @Test
    public void testContainsChar() {
        for (int i = 0; i < TEST_STRING.length(); i++) {
@@ -468,7 +466,7 @@ public class StringUtilTest {
        assertEquals(TEST_STRING, StringUtil.ltrim(TEST_STRING));
        assertEquals(TEST_STRING, StringUtil.ltrim("  " + TEST_STRING));
        assertEquals(TEST_STRING, StringUtil.ltrim(WHITESPACE_STRING + TEST_STRING));
-        assertNotEquals(TEST_STRING, StringUtil.ltrim(TEST_STRING + WHITESPACE_STRING));
+        assertFalse(TEST_STRING.equals(StringUtil.ltrim(TEST_STRING + WHITESPACE_STRING)));
        // TODO: Test is not complete
    }

@@ -477,7 +475,7 @@ public class StringUtilTest {
        assertEquals(TEST_STRING, StringUtil.rtrim(TEST_STRING));
        assertEquals(TEST_STRING, StringUtil.rtrim(TEST_STRING + "  "));
        assertEquals(TEST_STRING, StringUtil.rtrim(TEST_STRING + WHITESPACE_STRING));
-        assertNotEquals(TEST_STRING, StringUtil.rtrim(WHITESPACE_STRING + TEST_STRING));
+        assertFalse(TEST_STRING.equals(StringUtil.rtrim(WHITESPACE_STRING + TEST_STRING)));
        // TODO: Test is not complete
    }

@@ -518,7 +516,7 @@ public class StringUtilTest {
    public void testCaptialize() {
        assertNull(StringUtil.capitalize(null));
        assertEquals(TEST_STRING.toUpperCase(), StringUtil.capitalize(TEST_STRING.toUpperCase()));
-        assertEquals('A', StringUtil.capitalize("abc").charAt(0));
+        assertTrue(StringUtil.capitalize("abc").charAt(0) == 'A');
    }

    @Test
@@ -554,13 +552,13 @@ public class StringUtilTest {
    public void testToDateWithFormatString() {
        Calendar cal = new GregorianCalendar();
        cal.clear();
-        cal.set(1976, Calendar.MARCH, 16); // Month is 0-based
+        cal.set(1976, 2, 16); // Month is 0-based
        Date date = StringUtil.toDate("16.03.1976", "dd.MM.yyyy");
        assertNotNull(date);
        assertEquals(cal.getTime(), date);

        cal.clear();
-        cal.set(2004, Calendar.MAY, 13, 23, 51, 3);
+        cal.set(2004, 4, 13, 23, 51, 3);
        date = StringUtil.toDate("2004-5-13 23:51 (03)", "yyyy-MM-dd hh:mm (ss)");
        assertNotNull(date);
        assertEquals(cal.getTime(), date);
@@ -578,15 +576,15 @@ public class StringUtilTest {
    public void testToDateWithFormat() {
        Calendar cal = new GregorianCalendar();
        cal.clear();
-        cal.set(1976, Calendar.MARCH, 16); // Month is 0-based
+        cal.set(1976, 2, 16); // Month is 0-based
        Date date = StringUtil.toDate("16.03.1976", new SimpleDateFormat("dd.MM.yyyy"));
        assertNotNull(date);
        assertEquals(cal.getTime(), date);

        cal.clear();
-        cal.set(2004, Calendar.MAY, 13, 23, 51);
-        DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, new Locale("no", "NO"));
-        date = StringUtil.toDate(format.format(cal.getTime()), format);
+        cal.set(2004, 4, 13, 23, 51);
+        date = StringUtil.toDate("13.5.04 23:51",
+                                 DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, new Locale("no", "NO")));
        assertNotNull(date);
        assertEquals(cal.getTime(), date);

@@ -603,9 +601,10 @@ public class StringUtilTest {
    public void testToTimestamp() {
        Calendar cal = new GregorianCalendar();
        cal.clear();
-        cal.set(1976, Calendar.MARCH, 16, 21, 28, 4); // Month is 0-based
-        Timestamp date = StringUtil.toTimestamp("1976-03-16 21:28:04");
+        cal.set(1976, 2, 16, 21, 28, 4); // Month is 0-based
+        Date date = StringUtil.toTimestamp("1976-03-16 21:28:04");
        assertNotNull(date);
+        assertTrue(date instanceof Timestamp);
        assertEquals(cal.getTime(), date);
    }

@@ -822,7 +821,7 @@ public class StringUtilTest {
        assertTrue(StringUtil.isNumber("12345"));
        assertTrue(StringUtil.isNumber(TEST_INTEGER.toString()));
        assertTrue(StringUtil.isNumber("1234567890123456789012345678901234567890"));
-        assertTrue(StringUtil.isNumber(String.valueOf(Long.MAX_VALUE) + Long.MAX_VALUE));
+        assertTrue(StringUtil.isNumber(String.valueOf(Long.MAX_VALUE) + String.valueOf(Long.MAX_VALUE)));
        assertFalse(StringUtil.isNumber("abc"));
        assertFalse(StringUtil.isNumber(TEST_STRING));
    }
@@ -832,7 +831,7 @@ public class StringUtilTest {
        assertTrue(StringUtil.isNumber("-12345"));
        assertTrue(StringUtil.isNumber('-' + TEST_INTEGER.toString()));
        assertTrue(StringUtil.isNumber("-1234567890123456789012345678901234567890"));
-        assertTrue(StringUtil.isNumber('-' + String.valueOf(Long.MAX_VALUE) + Long.MAX_VALUE));
+        assertTrue(StringUtil.isNumber('-' + String.valueOf(Long.MAX_VALUE) + String.valueOf(Long.MAX_VALUE)));
        assertFalse(StringUtil.isNumber("-abc"));
        assertFalse(StringUtil.isNumber('-' + TEST_STRING));
    }
@@ -557,7 +557,7 @@ public class TimeoutMapTest extends MapAbstractTest {
                // NOTE: Only wait fist time, to avoid slooow tests
                synchronized (this) {
                    try {
-                        wait(60L);
+                        wait(60l);
                    }
                    catch (InterruptedException e) {
                    }
@@ -591,7 +591,7 @@ public class TimeoutMapTest extends MapAbstractTest {
                    try {
                        wait(60l);
                    }
-                    catch (InterruptedException ignore) {
+                    catch (InterruptedException e) {
                    }
                }
            }
@@ -651,24 +651,5 @@ public class TimeoutMapTest extends MapAbstractTest {
        assertTrue("Wrong entry removed, keySet().iterator() is broken.", !map.containsKey(removedKey));
        assertTrue("Wrong entry removed, keySet().iterator() is broken.", map.containsKey(otherKey));
    }
-
-
-    @Test
-    public void testContainsKeyOnEmptyMap() {
-        // See #600
-        Map<String, String> timeoutMap = new TimeoutMap<>(30);
-        assertFalse(timeoutMap.containsKey("xyz"));
-        timeoutMap.put("xyz", "xyz");
-        assertTrue(timeoutMap.containsKey("xyz"));
-
-        try {
-            Thread.sleep(50); // Let the item expire
-        }
-        catch (InterruptedException ignore) {
-        }
-
-        assertFalse(timeoutMap.containsKey("xyz"));
-        assertNull(timeoutMap.get("xyz"));
-    }
 }

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <groupId>com.twelvemonkeys.common</groupId>
    <artifactId>common</artifactId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <groupId>com.twelvemonkeys.contrib</groupId>
    <artifactId>contrib</artifactId>
@@ -31,9 +31,8 @@
 package com.twelvemonkeys.contrib.tiff;

 import com.twelvemonkeys.contrib.tiff.TIFFUtilities.TIFFExtension;
-import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadataFormat;
+import com.twelvemonkeys.imageio.plugins.tiff.TIFFMedataFormat;
 import com.twelvemonkeys.io.FileUtil;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.w3c.dom.Node;
@@ -155,7 +154,7 @@ public class TIFFUtilitiesTest {
        reader.setInput(checkTest1);
        for (int i = 0; i < 3; i++) {
            Node metaData = reader.getImageMetadata(i)
-                    .getAsTree(TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME);
+                    .getAsTree(TIFFMedataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME);
            short orientation = ((Number) expression.evaluate(metaData, XPathConstants.NUMBER)).shortValue();
            Assert.assertEquals(orientation, TIFFExtension.ORIENTATION_RIGHTTOP);
        }
@@ -172,7 +171,7 @@ public class TIFFUtilitiesTest {
        reader.setInput(checkTest2);
        for (int i = 0; i < 3; i++) {
            Node metaData = reader.getImageMetadata(i)
-                    .getAsTree(TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME);
+                    .getAsTree(TIFFMedataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME);
            short orientation = ((Number) expression.evaluate(metaData, XPathConstants.NUMBER)).shortValue();
            Assert.assertEquals(orientation, i == 1
                                             ? TIFFExtension.ORIENTATION_BOTRIGHT
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-batik</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Batik Plugin</name>
@@ -14,12 +14,6 @@
        See the <a href="http://xmlgraphics.apache.org/batik/">Batik Home page</a>
        for more information.]]>
    </description>
-
-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.batik</project.jpms.module.name>
-        <batik.version>1.14</batik.version>
-    </properties>
-
    <build>
        <plugins>
            <plugin>
@@ -48,13 +42,6 @@
            <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>
@@ -75,6 +62,13 @@
            <scope>provided</scope>
        </dependency>

+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>xmlgraphics-commons</artifactId>
+            <version>2.2</version>
+            <scope>provided</scope>
+        </dependency>
+
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>batik-anim</artifactId>
@@ -98,7 +92,7 @@
            <!--
            There seems to be some weirdness in the
            Batik/FOP poms (Batik depends on FOP 0.20-5) that screws things up,
-            making everything end up depending on Batik 1.5, not the specified version
+            making everything end up depending on Batik 1.5, not 1.6
            -->
            <exclusions>
                <exclusion>
@@ -108,4 +102,8 @@
            </exclusions>
        </dependency>
    </dependencies>
+
+    <properties>
+        <batik.version>1.14</batik.version>
+    </properties>
 </project>
@@ -30,8 +30,37 @@

 package com.twelvemonkeys.imageio.plugins.svg;

+import com.twelvemonkeys.image.ImageUtil;
+import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.lang.StringUtil;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.bridge.*;
+import org.apache.batik.css.parser.CSSLexicalUnit;
+import org.apache.batik.dom.util.DOMUtilities;
+import org.apache.batik.ext.awt.image.GraphicsUtil;
+import org.apache.batik.gvt.CanvasGraphicsNode;
+import org.apache.batik.gvt.GraphicsNode;
+import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory;
+import org.apache.batik.gvt.renderer.ImageRenderer;
+import org.apache.batik.gvt.renderer.ImageRendererFactory;
+import org.apache.batik.transcoder.*;
+import org.apache.batik.transcoder.image.ImageTranscoder;
+import org.apache.batik.util.ParsedURL;
+import org.apache.batik.util.SVGConstants;
+import org.apache.batik.xml.LexicalUnits;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.svg.SVGSVGElement;
+
+import javax.imageio.IIOException;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.spi.ImageReaderSpi;
 import java.awt.*;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Dimension2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -41,38 +70,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;

-import javax.imageio.IIOException;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.spi.ImageReaderSpi;
-
-import org.apache.batik.anim.dom.SVGDOMImplementation;
-import org.apache.batik.anim.dom.SVGOMDocument;
-import org.apache.batik.bridge.*;
-import org.apache.batik.dom.util.DOMUtilities;
-import org.apache.batik.ext.awt.image.GraphicsUtil;
-import org.apache.batik.gvt.CanvasGraphicsNode;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory;
-import org.apache.batik.gvt.renderer.ImageRenderer;
-import org.apache.batik.gvt.renderer.ImageRendererFactory;
-import org.apache.batik.transcoder.SVGAbstractTranscoder;
-import org.apache.batik.transcoder.TranscoderException;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.TranscodingHints;
-import org.apache.batik.transcoder.image.ImageTranscoder;
-import org.apache.batik.util.ParsedURL;
-import org.apache.batik.util.SVGConstants;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.svg.SVGSVGElement;
-
-import com.twelvemonkeys.image.ImageUtil;
-import com.twelvemonkeys.imageio.ImageReaderBase;
-import com.twelvemonkeys.imageio.util.IIOUtil;
-import com.twelvemonkeys.lang.StringUtil;
-
 /**
 * Image reader for SVG document fragments.
 *
@@ -135,7 +132,6 @@ public class SVGImageReader extends ImageReaderBase {
            // Set ImageReadParams as hints
            // Note: The cast to Map invokes a different method that preserves
            // unset defaults, DO NOT REMOVE!
-            //noinspection rawtypes
            rasterizer.setTranscodingHints((Map) paramsToHints(svgParam));
        }

@@ -264,7 +260,7 @@ public class SVGImageReader extends ImageReaderBase {
        }
    }

-    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) {
+    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
        return Collections.singleton(ImageTypeSpecifier.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator();
    }

@@ -293,7 +289,7 @@ public class SVGImageReader extends ImageReaderBase {
        }

        //  This is cheating... We don't fully transcode after all
-        protected void transcode(Document document, final String uri, final TranscoderOutput output) {
+        protected void transcode(Document document, final String uri, final TranscoderOutput output) throws TranscoderException {
            // Sets up root, curTxf & curAoi
            // ----
            if (document != null) {
@@ -588,7 +584,9 @@ public class SVGImageReader extends ImageReaderBase {
                return dest;
            }
            catch (Exception ex) {
-                throw new TranscoderException(ex.getMessage(), ex);
+                TranscoderException exception = new TranscoderException(ex.getMessage());
+                exception.initCause(ex);
+                throw exception;
            }
            finally {
                if (context != null) {
@@ -657,7 +655,7 @@ public class SVGImageReader extends ImageReaderBase {
                if (allowExternalResources) {
                    return super.getExternalResourceSecurity(resourceURL, docURL);
                }
-                return new EmbededExternalResourceSecurity(resourceURL);
+                return new NoLoadExternalResourceSecurity();
            }
        }
    }
@@ -54,6 +54,8 @@ import java.util.Collections;
 import java.util.List;

 import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.*;

 /**
@@ -223,7 +225,7 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
            assertEquals(500, image.getHeight());

            // CSS and embedded resources all go!
-            verifyNoInteractions(listener);
+            verifyZeroInteractions(listener);
        }
        finally {
            reader.dispose();
@@ -264,7 +266,7 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
            assertEquals(500, image.getHeight());

            // No more warnings now that the base URI is set
-            verifyNoInteractions(listener);
+            verifyZeroInteractions(listener);
        }
        finally {
            reader.dispose();
@@ -295,25 +297,6 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
        }
    }

-    @Test
-    public void testReadEmbeddedWithDisallowExternalResources() throws IOException{
-        // File using "data:" URLs for embedded resources
-        URL resource = getClassLoaderResource("/svg/embedded-data-resource.svg");
-        SVGImageReader reader = createReader();
-
-        TestData data = new TestData(resource, (Dimension) null);
-        try (ImageInputStream stream = data.getInputStream()) {
-            reader.setInput(stream);
-
-            SVGReadParam param = reader.getDefaultReadParam();
-            param.setAllowExternalResources(false);
-            reader.read(0, param);
-        }
-        finally {
-            reader.dispose();
-        }
-    }
-
    @Test(expected = SecurityException.class)
    public void testDisallowedExternalResources() throws URISyntaxException, IOException {
        // system-property set to true in surefire-plugin-settings in the pom
@@ -4,16 +4,12 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-bmp</artifactId>
    <name>TwelveMonkeys :: ImageIO :: BMP plugin</name>
    <description>ImageIO plugin for Microsoft Device Independent Bitmap (BMP/DIB) format.</description>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.bmp</project.jpms.module.name>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
@@ -30,6 +30,28 @@

 package com.twelvemonkeys.imageio.plugins.bmp;

+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;
+import java.io.DataInput;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+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;
@@ -39,23 +61,6 @@ 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.*;
-import java.io.DataInput;
-import java.io.File;
-import java.io.IOException;
-import java.nio.ByteOrder;
-import java.util.Collections;
-import java.util.Iterator;
-
 /**
 * ImageReader for Microsoft Windows Bitmap (BMP) format.
 *
@@ -200,7 +205,7 @@ public final class BMPImageReader extends ImageReaderBase {
        checkBounds(pImageIndex);

        // TODO: Better implementation, include INT_RGB types for 3BYTE_BGR and 4BYTE_ABGR for INT_ARGB
-        return Collections.singletonList(getRawImageType(pImageIndex)).iterator();
+        return Arrays.asList(getRawImageType(pImageIndex)).iterator();
    }

    @Override
@@ -405,13 +410,6 @@ public final class BMPImageReader extends ImageReaderBase {

    private ImageReader initReaderDelegate(int compression) throws IOException {
        ImageReader reader = getImageReaderDelegate(compression);
-        reader.reset();
-
-        // Install listener
-        ListenerDelegator listenerDelegator = new ListenerDelegator();
-        reader.addIIOReadWarningListener(listenerDelegator);
-        reader.addIIOReadProgressListener(listenerDelegator);
-        reader.addIIOReadUpdateListener(listenerDelegator);

        imageInput.seek(pixelOffset);
        reader.setInput(new SubImageInputStream(imageInput, header.getImageSize()));
@@ -452,6 +450,12 @@ public final class BMPImageReader extends ImageReaderBase {

        ImageReader reader = readers.next();

+        // Install listener
+        ListenerDelegator listenerDelegator = new ListenerDelegator();
+        reader.addIIOReadWarningListener(listenerDelegator);
+        reader.addIIOReadProgressListener(listenerDelegator);
+        reader.addIIOReadUpdateListener(listenerDelegator);
+
        // Cache for later use
        switch (compression) {
            case DIB.COMPRESSION_JPEG:
@@ -477,12 +481,8 @@ public final class BMPImageReader extends ImageReaderBase {

    private void readRowByte(final DataInput input, final int height, final Rectangle srcRegion, final int xSub, final int ySub,
                             final byte[] rowDataByte, final WritableRaster destChannel, final Raster srcChannel, final int y) throws IOException {
-        // Flip into position?
-        int srcY = !header.topDown ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
        // If subsampled or outside source region, skip entire row
-        if (srcY % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
            input.skipBytes(rowDataByte.length);

            return;
@@ -497,17 +497,19 @@ public final class BMPImageReader extends ImageReaderBase {
            }
        }

-        destChannel.setDataElements(0, dstY, srcChannel);
+        if (header.topDown) {
+            destChannel.setDataElements(0, y, srcChannel);
+        } else {
+            // Flip into position
+            int dstY = (height - 1 - y - srcRegion.y) / ySub;
+            destChannel.setDataElements(0, dstY, srcChannel);
+        }
    }

    private void readRowUShort(final DataInput input, final int height, final Rectangle srcRegion, final int xSub, final int ySub,
                               final short[] rowDataUShort, final WritableRaster destChannel, final Raster srcChannel, final int y) throws IOException {
-        // Flip into position?
-        int srcY = !header.topDown ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
        // If subsampled or outside source region, skip entire row
-        if (srcY % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
            input.skipBytes(rowDataUShort.length * 2 + (rowDataUShort.length % 2) * 2);

            return;
@@ -527,17 +529,19 @@ public final class BMPImageReader extends ImageReaderBase {
            }
        }

-        destChannel.setDataElements(0, dstY, srcChannel);
+        if (header.topDown) {
+            destChannel.setDataElements(0, y, srcChannel);
+        } else {
+            // Flip into position
+            int dstY = (height - 1 - y - srcRegion.y) / ySub;
+            destChannel.setDataElements(0, dstY, srcChannel);
+        }
    }

    private void readRowInt(final DataInput input, final int height, final Rectangle srcRegion, final int xSub, final int ySub,
                            final int[] rowDataInt, final WritableRaster destChannel, final Raster srcChannel, final int y) throws IOException {
-        // Flip into position?
-        int srcY = !header.topDown ? height - 1 - y : y;
-        int dstY = (srcY - srcRegion.y) / ySub;
-
        // If subsampled or outside source region, skip entire row
-        if (srcY % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
            input.skipBytes(rowDataInt.length * 4);

            return;
@@ -552,7 +556,13 @@ public final class BMPImageReader extends ImageReaderBase {
            }
        }

-        destChannel.setDataElements(0, dstY, srcChannel);
+        if (header.topDown) {
+            destChannel.setDataElements(0, y, srcChannel);
+        } else {
+            // Flip into position
+            int dstY = (height - 1 - y - srcRegion.y) / ySub;
+            destChannel.setDataElements(0, dstY, srcChannel);
+        }
    }

    // TODO: Candidate util method
@@ -623,8 +633,7 @@ public final class BMPImageReader extends ImageReaderBase {
        return new BMPMetadata(header, colors);
    }

-    @SuppressWarnings("ConstantConditions")
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException {
        BMPImageReaderSpi provider = new BMPImageReaderSpi();
        BMPImageReader reader = new BMPImageReader(provider);

@@ -677,7 +686,7 @@ public final class BMPImageReader extends ImageReaderBase {
        }
    }

-    @SuppressWarnings({ "unchecked", "UnusedDeclaration", "SameParameterValue" })
+    @SuppressWarnings({"unchecked", "UnusedDeclaration"})
    static <T extends Throwable> void throwAs(final Class<T> pType, final Throwable pThrowable) throws T {
        throw (T) pThrowable;
    }
@@ -364,11 +364,7 @@ abstract class DIBHeader {

        public String getBMPVersion() {
            // This is to be compatible with the native metadata of the original com.sun....BMPMetadata
-            return size > DIB.BITMAP_INFO_HEADER_SIZE
-                   ? "BMP V2/V3 INFO"
-                   : compression == DIB.COMPRESSION_BITFIELDS || compression == DIB.COMPRESSION_ALPHA_BITFIELDS
-                     ? "BMP v. 3.x NT"
-                     : "BMP v. 3.x";
+            return compression == DIB.COMPRESSION_BITFIELDS ? "BMP v. 3.x NT" : "BMP v. 3.x";
        }
    }

@@ -32,8 +32,8 @@ package com.twelvemonkeys.imageio.plugins.bmp;

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

@@ -318,7 +318,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
        // At least imageStarted and imageComplete, plus any number of imageProgress
        InOrder ordered = inOrder(listener);
        ordered.verify(listener).imageStarted(reader, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
        ordered.verify(listener).imageComplete(reader);
    }

@@ -342,7 +342,6 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>

        for (TestData data : getTestData()) {
            if (data.getInput().toString().contains("pal8offs")) {
-                // Skip: Contains extra bogus PaletteEntry nodes
                continue;
            }

@@ -359,7 +358,6 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
                System.err.println("WARNING: Reading " + data + " caused exception: " + e.getMessage());
                continue;
            }
-
            IIOMetadata jreMetadata = jreReader.getImageMetadata(0);

            assertTrue(metadata.isStandardMetadataFormatSupported());
@@ -372,7 +370,6 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
                String absolutePath = data.toString();
                String localPath = absolutePath.substring(absolutePath.lastIndexOf("test-classes") + 12);

-                // TODO: blauesglas_16_bitmask444 fails BMP Version for 11+
                Node expectedTree = jreMetadata.getAsTree(format);
                Node actualTree = metadata.getAsTree(format);

@@ -431,7 +428,6 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
        }
    }

-    @SuppressWarnings("RedundantIfStatement")
    private boolean excludeEqualValueTest(final Node expected) {
        if (expected.getLocalName().equals("ImageSize")) {
            // JRE metadata returns 0, even if known in reader...
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-clippath</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Photoshop Path Support</name>
@@ -12,10 +12,6 @@
        Photoshop Clipping Path Support.
    </description>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.clippath</project.jpms.module.name>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
@@ -39,7 +39,6 @@ import java.io.IOException;
 *
 * @deprecated Use {@link AdobePathReader} instead. This class will be removed in a future release.
 */
-@Deprecated
 public final class AdobePathBuilder {

    private final AdobePathReader delegate;
@@ -4,15 +4,11 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-core</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Core</name>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.core</project.jpms.module.name>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>com.twelvemonkeys.common</groupId>
@@ -265,9 +265,8 @@ public abstract class ImageReaderBase extends ImageReader {
                        // - transferType is ok
                        // - bands are ok
                        // TODO: Test if color model is ok?
-                        if (specifier.getSampleModel().getTransferType() == dest.getSampleModel().getTransferType()
-                                && Arrays.equals(specifier.getSampleModel().getSampleSize(), dest.getSampleModel().getSampleSize())
-                                && specifier.getNumBands() <= dest.getSampleModel().getNumBands()) {
+                        if (specifier.getSampleModel().getTransferType() == dest.getSampleModel().getTransferType() &&
+                                specifier.getNumBands() <= dest.getSampleModel().getNumBands()) {
                            found = true;
                            break;
                        }
@@ -1,563 +0,0 @@
-/*
- * Copyright (c) 2021, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.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);
-        }
-    }
-}
@@ -30,17 +30,23 @@

 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 static com.twelvemonkeys.imageio.color.ColorProfiles.*;
+import java.util.Properties;

 /**
 * A helper class for working with ICC color profiles and color spaces.
@@ -77,6 +83,9 @@ 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. */
@@ -87,17 +96,24 @@ 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<>(16);
+    private static final Map<Key, ICC_ColorSpace> cache = new LRUHashMap<>(10);

    static {
-        // In case we didn't activate through SPI already
-        ProfileDeferralActivator.activateProfiles();
+        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();
+        }
    }

    private ColorSpaces() {}
@@ -118,7 +134,7 @@ public final class ColorSpaces {
        Validate.notNull(profile, "profile");

        // Fix profile before lookup/create
-        fixProfile(profile);
+        profileCleaner.fixProfile(profile);

        byte[] profileHeader = getProfileHeaderWithProfileId(profile);

@@ -130,20 +146,53 @@ public final class ColorSpaces {
        return getCachedOrCreateCS(profile, profileHeader);
    }

-    static ICC_ColorSpace getInternalCS(final int profileCSType, final byte[] profileHeader) {
-        if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.sRGB.header)) {
+    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)) {
            return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_sRGB);
        }
-        else if (profileCSType == ColorSpace.TYPE_GRAY && Arrays.equals(profileHeader, ColorProfiles.GRAY.header)) {
+        else if (profileCSType == ColorSpace.TYPE_GRAY && Arrays.equals(profileHeader, GRAY.header)) {
            return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_GRAY);
        }
-        else if (profileCSType == ColorSpace.TYPE_3CLR && Arrays.equals(profileHeader, ColorProfiles.PYCC.header)) {
+        else if (profileCSType == ColorSpace.TYPE_3CLR && Arrays.equals(profileHeader, PYCC.header)) {
            return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_PYCC);
        }
-        else if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.LINEAR_RGB.header)) {
+        else if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, LINEAR_RGB.header)) {
            return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB);
        }
-        else if (profileCSType == ColorSpace.TYPE_XYZ && Arrays.equals(profileHeader, ColorProfiles.CIEXYZ.header)) {
+        else if (profileCSType == ColorSpace.TYPE_XYZ && Arrays.equals(profileHeader, CIEXYZ.header)) {
            return (ICC_ColorSpace) ColorSpace.getInstance(ColorSpace.CS_CIEXYZ);
        }

@@ -154,36 +203,26 @@ public final class ColorSpaces {
        Key key = new Key(profileHeader);

        synchronized (cache) {
-            ICC_ColorSpace cs = getCachedCS(key);
+            ICC_ColorSpace cs = cache.get(key);

            if (cs == null) {
                cs = new ICC_ColorSpace(profile);

                validateColorSpace(cs);

-                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);
-                }
+                key = profileCleaner.validationAltersProfileHeader()
+                      ? new Key(getProfileHeaderWithProfileId(cs.getProfile()))
+                      : key;
+
+                cache.put(key, cs);
            }

            return 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) {
+    private 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});
@@ -194,27 +233,73 @@ public final class ColorSpaces {
    }

    /**
-     * @deprecated Use {@link ColorProfiles#isCS_sRGB(ICC_Profile)} instead.
+     * 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
    public static boolean isCS_sRGB(final ICC_Profile profile) {
-        return ColorProfiles.isCS_sRGB(profile);
+        Validate.notNull(profile, "profile");
+
+        return profile.getColorSpaceType() == ColorSpace.TYPE_RGB && Arrays.equals(getProfileHeaderWithProfileId(profile), sRGB.header);
    }

    /**
-     * @deprecated Use {@link ColorProfiles#isCS_GRAY(ICC_Profile)} instead.
+     * 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
-    public static boolean isCS_GRAY(final ICC_Profile profile) {
-        return ColorProfiles.isCS_GRAY(profile);
+    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 Use {@link ColorProfiles#validateProfile(ICC_Profile)} instead.
+     * 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
    public static ICC_Profile validateProfile(final ICC_Profile profile) {
-        return ColorProfiles.validateProfile(profile);
+        // Fix profile before validation
+        profileCleaner.fixProfile(profile);
+        validateColorSpace(new ICC_ColorSpace(profile));
+
+        return profile;
    }

    /**
@@ -297,6 +382,50 @@ 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;

@@ -319,4 +448,78 @@ 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);
+        }
+    }
 }
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2021, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.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();
-        }
-    }
-}
@@ -61,7 +61,7 @@ public final class UInt32ColorModel extends ComponentColorModel {
        // This class only supports DataBuffer.TYPE_INT, cast is safe
        int[] ipixel = (int[]) pixel;
        for (int c = 0, nc = normOffset; c < numComponents; c++, nc++) {
-            normComponents[nc] = ((float) (ipixel[c] & 0xFFFFFFFFL)) / ((float) ((1L << getComponentSize(c)) - 1));
+            normComponents[nc] = ((float) (ipixel[c] & 0xffffffffl)) / ((float) ((1l << getComponentSize(c)) - 1));
        }

        int numColorComponents = getNumColorComponents();
@@ -45,82 +45,36 @@ public final class YCbCrConverter {
    private final static int CENTERJSAMPLE = 128;
    private final static int ONE_HALF = 1 << (SCALEBITS - 1);

-    private final static class JPEG {
-        private final static int[] Cr_R_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cb_B_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cr_G_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cb_G_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cr_R_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cb_B_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cr_G_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cb_G_LUT = new int[MAXJSAMPLE + 1];

-        /**
-         * Initializes tables for YCC->RGB color space conversion.
-         */
-        private static void buildYCCtoRGBtable() {
-            if (ColorSpaces.DEBUG) {
-                System.err.println("Building JPEG YCbCr conversion table");
-            }
-
-            for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-                // i is the actual input pixel value, in the range 0..MAXJSAMPLE
-                // The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE
-                // Cr=>R value is nearest int to 1.40200 * x
-                Cr_R_LUT[i] = (int) ((1.40200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
-                // Cb=>B value is nearest int to 1.77200 * x
-                Cb_B_LUT[i] = (int) ((1.77200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
-                // Cr=>G value is scaled-up -0.71414 * x
-                Cr_G_LUT[i] = -(int) (0.71414 * (1 << SCALEBITS) + 0.5) * x;
-                // Cb=>G value is scaled-up -0.34414 * x
-                // We also add in ONE_HALF so that need not do it in inner loop
-                Cb_G_LUT[i] = -(int) ((0.34414) * (1 << SCALEBITS) + 0.5) * x + ONE_HALF;
-            }
+    /**
+     * Initializes tables for YCC->RGB color space conversion.
+     */
+    private static void buildYCCtoRGBtable() {
+        if (ColorSpaces.DEBUG) {
+            System.err.println("Building YCC conversion table");
        }

-        static {
-            buildYCCtoRGBtable();
+        for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
+            // i is the actual input pixel value, in the range 0..MAXJSAMPLE
+            // The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE
+            // Cr=>R value is nearest int to 1.40200 * x
+            Cr_R_LUT[i] = (int) ((1.40200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
+            // Cb=>B value is nearest int to 1.77200 * x
+            Cb_B_LUT[i] = (int) ((1.77200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
+            // Cr=>G value is scaled-up -0.71414 * x
+            Cr_G_LUT[i] = -(int) (0.71414 * (1 << SCALEBITS) + 0.5) * x;
+            // Cb=>G value is scaled-up -0.34414 * x
+            // We also add in ONE_HALF so that need not do it in inner loop
+            Cb_G_LUT[i] = -(int) ((0.34414) * (1 << SCALEBITS) + 0.5) * x + ONE_HALF;
        }
    }

-    private final static class ITU_R_601 {
-        private final static int[] Cr_R_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cb_B_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cr_G_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Cb_G_LUT = new int[MAXJSAMPLE + 1];
-        private final static int[] Y_LUT = new int[MAXJSAMPLE + 1];
-
-        /**
-         * Initializes tables for YCC->RGB color space conversion.
-         */
-        private static void buildYCCtoRGBtable() {
-            if (ColorSpaces.DEBUG) {
-                System.err.println("Building ITU-R REC.601 YCbCr conversion table");
-            }
-
-            for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-                // i is the actual input pixel value, in the range 0..MAXJSAMPLE
-                // The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE
-
-                // Y'CbCr to RGB conversion, using values from BT.601 specification:
-                //   R = 1.16438 * (Y'-16)                      + 1.59603 * (Cr-128)
-                //   G = 1.16438 * (Y'-16) - 0.39176 * (Cb-128) - 0.81297 * (Cr-128)
-                //   B = 1.16438 * (Y'-16) + 2.01723 * (Cb-128)
-
-                // Cr=>R value is nearest int to 1.59603 * x
-                Cr_R_LUT[i] = ((int) (1.59603 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
-                // Cb=>B value is nearest int to 2.01723 * x
-                Cb_B_LUT[i] = ((int) (2.01723 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
-                // Cr=>G value is scaled-up -0.81297 * x
-                Cr_G_LUT[i] = -(int) (0.81297 * (1 << SCALEBITS) + 0.5) * x;
-                // Cb=>G value is scaled-up -0.39176 * x
-                // We also add in ONE_HALF so that need not do it in inner loop
-                Cb_G_LUT[i] = -(int) ((0.39176) * (1 << SCALEBITS) + 0.5) * x + ONE_HALF;
-
-                // Y`=>RGB
-                Y_LUT[i] = ((int) (1.16438 * (1 << SCALEBITS) + 0.5) * (i - 16) + ONE_HALF) >> SCALEBITS;
-            }
-        }
-
-        static {
-            buildYCCtoRGBtable();
-        }
+    static {
+        buildYCCtoRGBtable();
    }

    public static void convertYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final double[] coefficients, double[] referenceBW, final int offset) {
@@ -154,27 +108,17 @@ public final class YCbCrConverter {
        rgb[offset + 1] = clamp(green);
    }

-    public static void convertJPEGYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final int offset) {
-        int y  = yCbCr[offset    ] & 0xff;
-        int cb = yCbCr[offset + 1] & 0xff;
+    public static void convertYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final int offset) {
+        int y = yCbCr[offset] & 0xff;
        int cr = yCbCr[offset + 2] & 0xff;
+        int cb = yCbCr[offset + 1] & 0xff;

-        rgb[offset    ] = clamp(y + JPEG.Cr_R_LUT[cr]);
-        rgb[offset + 1] = clamp(y + (JPEG.Cb_G_LUT[cb] + JPEG.Cr_G_LUT[cr] >> SCALEBITS));
-        rgb[offset + 2] = clamp(y + JPEG.Cb_B_LUT[cb]);
+        rgb[offset] = clamp(y + Cr_R_LUT[cr]);
+        rgb[offset + 1] = clamp(y + (Cb_G_LUT[cb] + Cr_G_LUT[cr] >> SCALEBITS));
+        rgb[offset + 2] = clamp(y + Cb_B_LUT[cb]);
    }

-    public static void convertRec601YCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final int offset) {
-        int y =  yCbCr[offset    ] & 0xff;
-        int cb = yCbCr[offset + 1] & 0xff;
-        int cr = yCbCr[offset + 2] & 0xff;
-
-        rgb[offset    ] = clamp(ITU_R_601.Y_LUT[y] + ITU_R_601.Cr_R_LUT[cr]);
-        rgb[offset + 1] = clamp(ITU_R_601.Y_LUT[y] + (ITU_R_601.Cr_G_LUT[cr] + ITU_R_601.Cb_G_LUT[cb] >> SCALEBITS));
-        rgb[offset + 2] = clamp(ITU_R_601.Y_LUT[y] + ITU_R_601.Cb_B_LUT[cb]);
-    }
-
-    private static byte clamp(final int val) {
+    private static byte clamp(int val) {
        return (byte) Math.max(0, Math.min(255, val));
    }
 }
@@ -49,10 +49,10 @@ public abstract class ReaderWriterProviderInfo extends ProviderInfo {
    private final String[] mimeTypes;
    private final String readerClassName;
    private final String[] readerSpiClassNames;
-    private final Class<?>[] inputTypes = new Class<?>[] {ImageInputStream.class};
+    private final Class[] inputTypes = new Class[] {ImageInputStream.class};
    private final String writerClassName;
    private final String[] writerSpiClassNames;
-    private final Class<?>[] outputTypes = new Class<?>[] {ImageOutputStream.class};
+    private final Class[] outputTypes = new Class[] {ImageOutputStream.class};
    private final boolean supportsStandardStreamMetadata;
    private final String nativeStreamMetadataFormatName;
    private final String nativeStreamMetadataFormatClassName;
@@ -80,7 +80,7 @@ public abstract class ReaderWriterProviderInfo extends ProviderInfo {
                                       final String writerClassName,
                                       final String[] writerSpiClassNames,
                                       final boolean supportsStandardStreamMetadata,
-                                       final String nativeStreamMetadataFormatName,
+                                       final String nativeStreameMetadataFormatName,
                                       final String nativeStreamMetadataFormatClassName,
                                       final String[] extraStreamMetadataFormatNames,
                                       final String[] extraStreamMetadataFormatClassNames,
@@ -99,7 +99,7 @@ public abstract class ReaderWriterProviderInfo extends ProviderInfo {
        this.writerClassName = writerClassName;
        this.writerSpiClassNames = writerSpiClassNames;
        this.supportsStandardStreamMetadata = supportsStandardStreamMetadata;
-        this.nativeStreamMetadataFormatName = nativeStreamMetadataFormatName;
+        this.nativeStreamMetadataFormatName = nativeStreameMetadataFormatName;
        this.nativeStreamMetadataFormatClassName = nativeStreamMetadataFormatClassName;
        this.extraStreamMetadataFormatNames = extraStreamMetadataFormatNames;
        this.extraStreamMetadataFormatClassNames = extraStreamMetadataFormatClassNames;
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2021, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.stream;
-
-import javax.imageio.stream.ImageInputStreamImpl;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import static com.twelvemonkeys.lang.Validate.notNull;
-import static java.lang.Math.max;
-
-/**
- * A buffered replacement for {@link javax.imageio.stream.FileImageInputStream}
- * that provides greatly improved performance for shorter reads, like single
- * byte or bit reads.
- * As with {@code javax.imageio.stream.FileImageInputStream}, either
- * {@link File} or {@link RandomAccessFile} can be used as input.
- *
- * @see javax.imageio.stream.FileImageInputStream
- */
-// TODO: Create a memory-mapped version?
-//  Or not... From java.nio.channels.FileChannel.map:
-//      For most operating systems, mapping a file into memory is more
-//      expensive than reading or writing a few tens of kilobytes of data via
-//      the usual {@link #read read} and {@link #write write} methods.  From the
-//      standpoint of performance it is generally only worth mapping relatively
-//      large files into memory.
-public final class BufferedFileImageInputStream extends ImageInputStreamImpl {
-    static final int DEFAULT_BUFFER_SIZE = 8192;
-
-    private byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
-    private int bufferPos;
-    private int bufferLimit;
-
-    private final ByteBuffer integralCache = ByteBuffer.allocate(8);
-    private final byte[] integralCacheArray = integralCache.array();
-
-    private RandomAccessFile raf;
-
-    /**
-     * Constructs a <code>BufferedFileImageInputStream</code> that will read from a given <code>File</code>.
-     *
-     * @param file a <code>File</code> to read from.
-     * @throws IllegalArgumentException if <code>file</code> is <code>null</code>.
-     * @throws FileNotFoundException    if <code>file</code> is a directory or cannot be opened for reading
-     *                                  for any reason.
-     */
-    public BufferedFileImageInputStream(final File file) throws FileNotFoundException {
-        this(new RandomAccessFile(notNull(file, "file"), "r"));
-    }
-
-    /**
-     * Constructs a <code>BufferedFileImageInputStream</code> that will read from a given <code>RandomAccessFile</code>.
-     *
-     * @param raf a <code>RandomAccessFile</code> to read from.
-     * @throws IllegalArgumentException if <code>raf</code> is <code>null</code>.
-     */
-    public BufferedFileImageInputStream(final RandomAccessFile raf) {
-        this.raf = notNull(raf, "raf");
-    }
-
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    private boolean fillBuffer() throws IOException {
-        int length = raf.read(buffer, 0, buffer.length);
-        bufferPos = 0;
-        bufferLimit = max(length, 0);
-
-        return bufferLimit > 0;
-    }
-
-    private boolean bufferEmpty() {
-        return bufferPos >= bufferLimit;
-    }
-
-    @Override
-    public void setByteOrder(ByteOrder byteOrder) {
-        super.setByteOrder(byteOrder);
-        integralCache.order(byteOrder);
-    }
-
-    @Override
-    public int read() throws IOException {
-        checkClosed();
-
-        if (bufferEmpty() && !fillBuffer()) {
-            return -1;
-        }
-
-        bitOffset = 0;
-        streamPos++;
-
-        return buffer[bufferPos++] & 0xff;
-    }
-
-    @Override
-    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 (length >= buffer.length) {
-                return readDirect(bytes, offset, length);
-            }
-            else if (!fillBuffer()) {
-                return -1;
-            }
-        }
-
-        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[] 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(bytes, offset, length);
-
-        if (read > 0) {
-            streamPos += read;
-        }
-
-        return read;
-    }
-
-    private int readBuffered(final byte[] bytes, final int offset, final int length) {
-        // Read as much as possible from buffer
-        int available = Math.min(bufferLimit - bufferPos, length);
-
-        if (available > 0) {
-            System.arraycopy(buffer, bufferPos, bytes, offset, available);
-            bufferPos += available;
-            streamPos += available;
-        }
-
-        return available;
-    }
-
-    public long length() {
-        // WTF?! This method is allowed to throw IOException in the interface...
-        try {
-            checkClosed();
-            return raf.length();
-        }
-        catch (IOException ignore) {
-        }
-
-        return -1;
-    }
-
-    public void close() throws IOException {
-        super.close();
-
-        raf.close();
-
-        raf = null;
-        buffer = null;
-    }
-
-    // Need to override the readShort(), readInt() and readLong() methods,
-    // because the implementations in ImageInputStreamImpl expects the
-    // read(byte[], int, int) to always read the expected number of bytes,
-    // causing uninitialized values, alignment issues and EOFExceptions at
-    // random places...
-    // Notes:
-    // * readUnsignedXx() is covered by their signed counterparts
-    // * readChar() is covered by readShort()
-    // * readFloat() and readDouble() is covered by readInt() and readLong()
-    //   respectively.
-    // * readLong() may be covered by two readInt()s, we'll override to be safe
-
-    @Override
-    public short readShort() throws IOException {
-        readFully(integralCacheArray, 0, 2);
-
-        return integralCache.getShort(0);
-    }
-
-    @Override
-    public int readInt() throws IOException {
-        readFully(integralCacheArray, 0, 4);
-
-        return integralCache.getInt(0);
-    }
-
-    @Override
-    public long readLong() throws IOException {
-        readFully(integralCacheArray, 0, 8);
-
-        return integralCache.getLong(0);
-    }
-
-    @Override
-    public void seek(long position) throws IOException {
-        checkClosed();
-
-        if (position < flushedPos) {
-            throw new IndexOutOfBoundsException("position < flushedPos!");
-        }
-
-        bitOffset = 0;
-
-        if (streamPos == position) {
-            return;
-        }
-
-        // Optimized to not invalidate buffer if new position is within current buffer
-        long newBufferPos = bufferPos + position - streamPos;
-        if (newBufferPos >= 0 && newBufferPos < bufferLimit) {
-            bufferPos = (int) newBufferPos;
-        }
-        else {
-            // Will invalidate buffer
-            bufferLimit = 0;
-            raf.seek(position);
-        }
-
-        streamPos = position;
-    }
-}
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2021, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.stream;
-
-import com.twelvemonkeys.imageio.spi.ProviderInfo;
-
-import javax.imageio.spi.ImageInputStreamSpi;
-import javax.imageio.spi.ServiceRegistry;
-import javax.imageio.stream.ImageInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.Iterator;
-import java.util.Locale;
-
-/**
- * BufferedFileImageInputStreamSpi
- * Experimental
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: BufferedFileImageInputStreamSpi.java,v 1.0 May 15, 2008 2:14:59 PM haraldk Exp$
- */
-public class BufferedFileImageInputStreamSpi extends ImageInputStreamSpi {
-    public BufferedFileImageInputStreamSpi() {
-        this(new StreamProviderInfo());
-    }
-
-    private BufferedFileImageInputStreamSpi(ProviderInfo providerInfo) {
-        super(providerInfo.getVendorName(), providerInfo.getVersion(), File.class);
-    }
-
-    @Override
-    public void onRegistration(final ServiceRegistry registry, final Class<?> category) {
-        Iterator<ImageInputStreamSpi> providers = registry.getServiceProviders(ImageInputStreamSpi.class, new FileInputFilter(), true);
-
-        while (providers.hasNext()) {
-            ImageInputStreamSpi provider = providers.next();
-            if (provider != this) {
-                registry.setOrdering(ImageInputStreamSpi.class, this, provider);
-            }
-        }
-    }
-
-    public ImageInputStream createInputStreamInstance(final Object input, final boolean pUseCache, final File pCacheDir) {
-        if (input instanceof File) {
-            try {
-                return new BufferedFileImageInputStream((File) input);
-            }
-            catch (FileNotFoundException e) {
-                // For consistency with the JRE bundled SPIs, we'll return null here,
-                // even though the spec does not say that's allowed.
-                // The problem is that the SPIs can only declare that they support an input type like a File,
-                // instead they should be allowed to inspect the instance, to see that the file does exist...
-                return null;
-            }
-        }
-
-        throw new IllegalArgumentException("Expected input of type File: " + input);
-    }
-
-    @Override
-    public boolean canUseCacheFile() {
-        return false;
-    }
-
-    public String getDescription(final Locale pLocale) {
-        return "Service provider that instantiates an ImageInputStream from a File";
-    }
-
-    private static class FileInputFilter implements ServiceRegistry.Filter {
-        @Override
-        public boolean filter(final Object provider) {
-            return ((ImageInputStreamSpi) provider).getInputClass() == File.class;
-        }
-    }
-}
@@ -43,19 +43,15 @@ import static com.twelvemonkeys.lang.Validate.notNull;
 * A buffered {@code ImageInputStream}.
 * Experimental - seems to be effective for {@link javax.imageio.stream.FileImageInputStream}
 * and {@link javax.imageio.stream.FileCacheImageInputStream} when doing a lot of single-byte reads
- * (or short byte-array reads).
+ * (or short byte-array reads) on OS X at least.
 * Code that uses the {@code readFully} methods are not affected by the issue.
- * <p>
- * NOTE: Invoking {@code close()} will  <em>NOT</em> close the wrapped stream.
- * </p>
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @author last modified by $Author: haraldk$
 * @version $Id: BufferedFileImageInputStream.java,v 1.0 May 15, 2008 4:36:49 PM haraldk Exp$
- *
- * @deprecated Use {@link BufferedFileImageInputStream} instead.
 */
-@Deprecated
+// TODO: Create a provider for this (wrapping the FileIIS and FileCacheIIS classes), and disable the Sun built-in spis?
+// TODO: Test on other platforms, might be just an OS X issue
 public final class BufferedImageInputStream extends ImageInputStreamImpl implements ImageInputStream {
    static final int DEFAULT_BUFFER_SIZE = 8192;

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2021, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.stream;
-
-import com.twelvemonkeys.imageio.spi.ProviderInfo;
-
-import javax.imageio.spi.ImageInputStreamSpi;
-import javax.imageio.spi.ServiceRegistry;
-import javax.imageio.stream.ImageInputStream;
-import java.io.File;
-import java.io.RandomAccessFile;
-import java.util.Iterator;
-import java.util.Locale;
-
-/**
- * BufferedRAFImageInputStreamSpi
- * Experimental
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: BufferedRAFImageInputStreamSpi.java,v 1.0 May 15, 2008 2:14:59 PM haraldk Exp$
- */
-public class BufferedRAFImageInputStreamSpi extends ImageInputStreamSpi {
-    public BufferedRAFImageInputStreamSpi() {
-        this(new StreamProviderInfo());
-    }
-
-    private BufferedRAFImageInputStreamSpi(ProviderInfo providerInfo) {
-        super(providerInfo.getVendorName(), providerInfo.getVersion(), RandomAccessFile.class);
-    }
-
-    @Override
-    public void onRegistration(final ServiceRegistry registry, final Class<?> category) {
-        Iterator<ImageInputStreamSpi> providers = registry.getServiceProviders(ImageInputStreamSpi.class, new RAFInputFilter(), true);
-
-        while (providers.hasNext()) {
-            ImageInputStreamSpi provider = providers.next();
-            if (provider != this) {
-                registry.setOrdering(ImageInputStreamSpi.class, this, provider);
-            }
-        }
-    }
-
-    public ImageInputStream createInputStreamInstance(final Object input, final boolean pUseCache, final File pCacheDir) {
-        if (input instanceof RandomAccessFile) {
-            return new BufferedFileImageInputStream((RandomAccessFile) input);
-        }
-
-        throw new IllegalArgumentException("Expected input of type RandomAccessFile: " + input);
-    }
-
-    @Override
-    public boolean canUseCacheFile() {
-        return false;
-    }
-
-    public String getDescription(final Locale pLocale) {
-        return "Service provider that instantiates an ImageInputStream from a RandomAccessFile";
-    }
-
-    private static class RAFInputFilter implements ServiceRegistry.Filter {
-        @Override
-        public boolean filter(final Object provider) {
-            return ((ImageInputStreamSpi) provider).getInputClass() == RandomAccessFile.class;
-        }
-    }
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Harald Kuhr
+ * Copyright (c) 2008, Harald Kuhr
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,7 @@ import com.twelvemonkeys.imageio.spi.ProviderInfo;

 import javax.imageio.spi.ImageInputStreamSpi;
 import javax.imageio.stream.FileCacheImageInputStream;
+import javax.imageio.stream.FileImageInputStream;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.MemoryCacheImageInputStream;
 import java.io.File;
@@ -71,7 +72,7 @@ public class URLImageInputStreamSpi extends ImageInputStreamSpi {
            // Special case for file protocol, a lot faster than FileCacheImageInputStream
            if ("file".equals(url.getProtocol())) {
                try {
-                    return new BufferedFileImageInputStream(new File(url.toURI()));
+                    return new BufferedImageInputStream(new FileImageInputStream(new File(url.toURI())));
                }
                catch (URISyntaxException ignore) {
                    // This should never happen, but if it does, we'll fall back to using the stream  
@@ -80,29 +81,29 @@ public class URLImageInputStreamSpi extends ImageInputStreamSpi {
            }

            // Otherwise revert to cached
-            final InputStream urlStream = url.openStream();
+            final InputStream stream = url.openStream();
            if (pUseCache) {
-                return new FileCacheImageInputStream(urlStream, pCacheDir) {
+                return new BufferedImageInputStream(new FileCacheImageInputStream(stream, pCacheDir) {
                    @Override
                    public void close() throws IOException {
                        try {
                            super.close();
                        }
                        finally {
-                            urlStream.close(); // NOTE: If this line throws IOE, it will shadow the original..
+                            stream.close(); // NOTE: If this line throws IOE, it will shadow the original..
                        }
                    }
-                };
+                });
            }
            else {
-                return new MemoryCacheImageInputStream(urlStream) {
+                return new MemoryCacheImageInputStream(stream) {
                    @Override
                    public void close() throws IOException {
                        try {
                            super.close();
                        }
                        finally {
-                            urlStream.close(); // NOTE: If this line throws IOE, it will shadow the original..
+                            stream.close(); // NOTE: If this line throws IOE, it will shadow the original..
                        }
                    }
                };
@@ -45,7 +45,6 @@ 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;

@@ -159,39 +158,33 @@ public final class IIOUtil {
    }

    /**
-     * THIS METHOD WILL BE MOVED/RENAMED, DO NOT USE.
+     * THIS METHOD WILL ME 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 BE MOVED/RENAMED, DO NOT USE.
+     * THIS METHOD WILL ME 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} if not found
+     * @return the provider instance, or {@code null}.
     */
    public static <T> T lookupProviderByName(final ServiceRegistry registry, final String providerClassName, Class<T> category) {
-        // 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;
-            }
+        try {
+            return category.cast(registry.getServiceProviderByClass(Class.forName(providerClassName)));
+        }
+        catch (ClassNotFoundException ignore) {
+            return null;
        }
-
-        return null;
    }

    /**
@@ -230,12 +223,7 @@ public final class IIOUtil {
    public static void subsampleRow(byte[] srcRow, int srcPos, int srcWidth,
                                    byte[] destRow, int destPos,
                                    int samplesPerPixel, int bitsPerSample, int samplePeriod) {
-        // Period == 1 is a no-op...
-        if (samplePeriod == 1) {
-            return;
-        }
-
-        Validate.isTrue(samplePeriod > 1, "samplePeriod must be > 1");
+        Validate.isTrue(samplePeriod > 1, "samplePeriod must be > 1"); // Period == 1 could be a no-op...
        Validate.isTrue(bitsPerSample > 0 && bitsPerSample <= 8 && (bitsPerSample == 1 || bitsPerSample % 2 == 0),
                "bitsPerSample must be > 0 and <= 8 and a power of 2");
        Validate.isTrue(samplesPerPixel > 0, "samplesPerPixel must be > 0");
@@ -273,12 +261,7 @@ public final class IIOUtil {
    public static void subsampleRow(short[] srcRow, int srcPos, int srcWidth,
                                    short[] destRow, int destPos,
                                    int samplesPerPixel, int bitsPerSample, int samplePeriod) {
-        // Period == 1 is a no-op...
-        if (samplePeriod == 1) {
-            return;
-        }
-
-        Validate.isTrue(samplePeriod > 1, "samplePeriod must be > 1");
+        Validate.isTrue(samplePeriod > 1, "samplePeriod must be > 1"); // Period == 1 could be a no-op...
        Validate.isTrue(bitsPerSample > 0 && bitsPerSample <= 16 && (bitsPerSample == 1 || bitsPerSample % 2 == 0),
                "bitsPerSample must be > 0 and <= 16 and a power of 2");
        Validate.isTrue(samplesPerPixel > 0, "samplesPerPixel must be > 0");
@@ -295,12 +278,7 @@ public final class IIOUtil {
    public static void subsampleRow(int[] srcRow, int srcPos, int srcWidth,
                                    int[] destRow, int destPos,
                                    int samplesPerPixel, int bitsPerSample, int samplePeriod) {
-        // Period == 1 is a no-op...
-        if (samplePeriod == 1) {
-            return;
-        }
-
-        Validate.isTrue(samplePeriod > 1, "samplePeriod must be > 1");
+        Validate.isTrue(samplePeriod > 1, "samplePeriod must be > 1"); // Period == 1 could be a no-op...
        Validate.isTrue(bitsPerSample > 0 && bitsPerSample <= 32 && (bitsPerSample == 1 || bitsPerSample % 2 == 0),
                "bitsPerSample must be > 0 and <= 32 and a power of 2");
        Validate.isTrue(samplesPerPixel > 0, "samplesPerPixel must be > 0");
@@ -30,21 +30,14 @@

 package com.twelvemonkeys.imageio.util;

-import static com.twelvemonkeys.lang.Validate.isTrue;
-import static com.twelvemonkeys.lang.Validate.notNull;
-
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DirectColorModel;
-import java.awt.image.IndexColorModel;
-import java.awt.image.MultiPixelPackedSampleModel;
-import java.awt.image.SampleModel;
+import com.twelvemonkeys.imageio.color.DiscreteAlphaIndexColorModel;

 import javax.imageio.ImageTypeSpecifier;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;

-import com.twelvemonkeys.imageio.color.DiscreteAlphaIndexColorModel;
+import static com.twelvemonkeys.lang.Validate.isTrue;
+import static com.twelvemonkeys.lang.Validate.notNull;

 /**
 * Factory class for creating {@code ImageTypeSpecifier}s.
@@ -176,36 +169,21 @@ public final class ImageTypeSpecifiers {

        int numEntries = 1 << bits;

-        ColorModel colorModel;
+        byte[] r = new byte[numEntries];
+        byte[] g = new byte[numEntries];
+        byte[] b = new byte[numEntries];

-        if (ColorSpace.getInstance(ColorSpace.CS_GRAY).equals(colorSpace)) {
-            // For default gray, use linear response
-            byte[] gray = new byte[numEntries];
+        // Scale array values according to color profile..
+        for (int i = 0; i < numEntries; i++) {
+            float[] gray = new float[]{i / (float) (numEntries - 1)};
+            float[] rgb = colorSpace.toRGB(gray);

-            for (int i = 0; i < numEntries; i++) {
-                gray[i] = (byte) ((i * 255) / (numEntries - 1));
-            }
-
-            colorModel = new IndexColorModel(bits, numEntries, gray, gray, gray);
-        }
-        else {
-            byte[] r = new byte[numEntries];
-            byte[] g = new byte[numEntries];
-            byte[] b = new byte[numEntries];
-
-            // Scale array values according to color profile..
-            for (int i = 0; i < numEntries; i++) {
-                float[] gray = new float[] { i / (float) (numEntries - 1) };
-                float[] rgb = colorSpace.toRGB(gray);
-
-                r[i] = (byte) Math.round(rgb[0] * 255);
-                g[i] = (byte) Math.round(rgb[1] * 255);
-                b[i] = (byte) Math.round(rgb[2] * 255);
-            }
-
-            colorModel = new IndexColorModel(bits, numEntries, r, g, b);
+            r[i] = (byte) (rgb[0] * 255);
+            g[i] = (byte) (rgb[1] * 255);
+            b[i] = (byte) (rgb[2] * 255);
        }

+        ColorModel colorModel = new IndexColorModel(bits, numEntries, r, g, b);
        SampleModel sampleModel = new MultiPixelPackedSampleModel(dataType, 1, 1, bits);

        return new ImageTypeSpecifier(colorModel, sampleModel);
@@ -223,7 +201,7 @@ public final class ImageTypeSpecifiers {
    }

    public static ImageTypeSpecifier createFromIndexColorModel(final IndexColorModel pColorModel) {
-        return new IndexedImageTypeSpecifier(pColorModel);
+        return IndexedImageTypeSpecifier.createFromIndexColorModel(pColorModel);
    }

    public static ImageTypeSpecifier createDiscreteAlphaIndexedFromIndexColorModel(final IndexColorModel pColorModel) {
@@ -30,13 +30,13 @@

 package com.twelvemonkeys.imageio.util;

-import static com.twelvemonkeys.lang.Validate.notNull;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.WritableRaster;
-
 import javax.imageio.ImageTypeSpecifier;
+import java.awt.image.BufferedImage;
+import java.awt.image.IndexColorModel;
+import java.awt.image.WritableRaster;
+import java.util.Hashtable;
+
+import static com.twelvemonkeys.lang.Validate.notNull;

 /**
 * IndexedImageTypeSpecifier
@@ -45,24 +45,27 @@ import javax.imageio.ImageTypeSpecifier;
 * @author last modified by $Author: haraldk$
 * @version $Id: IndexedImageTypeSpecifier.java,v 1.0 May 19, 2008 11:04:28 AM haraldk Exp$
 */
-final class IndexedImageTypeSpecifier extends ImageTypeSpecifier {
-    IndexedImageTypeSpecifier(final ColorModel colorModel) {
-        // For some reason, we need a sample model, even though we won't use it
-        super(notNull(colorModel, "colorModel"), colorModel.createCompatibleSampleModel(1, 1));
-    }
+final class IndexedImageTypeSpecifier  {
+    private IndexedImageTypeSpecifier() {}

-    @Override
-    public final BufferedImage createBufferedImage(final int pWidth, final int pHeight) {
-        try {
-            // This is a fix for the super-method, that first creates a sample model, and then
-            // creates a raster from it, using Raster.createWritableRaster. The problem with
-            // that approach, is that it always creates a TYPE_CUSTOM BufferedImage for indexed images.
-            WritableRaster raster = colorModel.createCompatibleWritableRaster(pWidth, pHeight);
-            return new BufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), null);
-        }
-        catch (NegativeArraySizeException e) {
-            // Exception most likely thrown from a DataBuffer constructor
-            throw new IllegalArgumentException("Array size > Integer.MAX_VALUE!");
-        }
+    static ImageTypeSpecifier createFromIndexColorModel(final IndexColorModel pColorModel) {
+        // For some reason, we need a sample model
+        return new ImageTypeSpecifier(notNull(pColorModel, "colorModel"), pColorModel.createCompatibleSampleModel(1, 1)) {
+
+            @Override
+            public final BufferedImage createBufferedImage(final int pWidth, final int pHeight) {
+                try {
+                    // This is a fix for the super-method, that first creates a sample model, and then
+                    // creates a raster from it, using Raster.createWritableRaster. The problem with
+                    // that approach, is that it always creates a TYPE_CUSTOM BufferedImage for indexed images.
+                    WritableRaster raster = colorModel.createCompatibleWritableRaster(pWidth, pHeight);
+                    return new BufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), new Hashtable());
+                }
+                catch (NegativeArraySizeException e) {
+                    // Exception most likely thrown from a DataBuffer constructor
+                    throw new IllegalArgumentException("Array size > Integer.MAX_VALUE!");
+                }
+            }
+        };
    }
 }
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2021, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.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;
-    }
-}
@@ -30,16 +30,15 @@

 package com.twelvemonkeys.imageio.util;

+import com.twelvemonkeys.imageio.color.UInt32ColorModel;
+
+import javax.imageio.ImageTypeSpecifier;
 import java.awt.color.ColorSpace;
 import java.awt.image.BandedSampleModel;
 import java.awt.image.DataBuffer;
 import java.awt.image.PixelInterleavedSampleModel;
 import java.awt.image.SampleModel;

-import javax.imageio.ImageTypeSpecifier;
-
-import com.twelvemonkeys.imageio.color.UInt32ColorModel;
-
 /**
 * ImageTypeSpecifier for interleaved 32 bit unsigned integral samples.
 *
@@ -48,13 +47,11 @@ import com.twelvemonkeys.imageio.color.UInt32ColorModel;
 * @author last modified by $Author: haraldk$
 * @version $Id: UInt32ImageTypeSpecifier.java,v 1.0 24.01.11 17.51 haraldk Exp$
 */
-final class UInt32ImageTypeSpecifier extends ImageTypeSpecifier {
-    private UInt32ImageTypeSpecifier(final ColorSpace cs, final boolean hasAlpha, final boolean isAlphaPremultiplied, final SampleModel sampleModel) {
-        super(new UInt32ColorModel(cs, hasAlpha, isAlphaPremultiplied), sampleModel);
-    }
+final class UInt32ImageTypeSpecifier {
+    private UInt32ImageTypeSpecifier() {}

    static ImageTypeSpecifier createInterleaved(final ColorSpace cs, final int[] bandOffsets, final boolean hasAlpha, final boolean isAlphaPremultiplied) {
-        return new UInt32ImageTypeSpecifier(
+        return create(
                cs, hasAlpha, isAlphaPremultiplied,
                new PixelInterleavedSampleModel(
                        DataBuffer.TYPE_INT, 1, 1,
@@ -66,7 +63,7 @@ final class UInt32ImageTypeSpecifier extends ImageTypeSpecifier {
    }

    static ImageTypeSpecifier createBanded(final ColorSpace cs, final int[] bandIndices, final int[] bandOffsets, final boolean hasAlpha, final boolean isAlphaPremultiplied) {
-        return new UInt32ImageTypeSpecifier(
+        return create(
                cs, hasAlpha, isAlphaPremultiplied,
                new BandedSampleModel(
                        DataBuffer.TYPE_INT, 1, 1, 1,
@@ -75,13 +72,7 @@ final class UInt32ImageTypeSpecifier extends ImageTypeSpecifier {
        );
    }

-    @Override
-    public boolean equals(final Object other) {
-        if (!(other instanceof UInt32ImageTypeSpecifier)) {
-            return false;
-        }
-
-        UInt32ImageTypeSpecifier that = (UInt32ImageTypeSpecifier) other;
-        return colorModel.equals(that.colorModel) && sampleModel.equals(that.sampleModel);
+    private static ImageTypeSpecifier create(final ColorSpace cs, final boolean hasAlpha, final boolean isAlphaPremultiplied, final SampleModel sampleModel) {
+        return new ImageTypeSpecifier(new UInt32ColorModel(cs, hasAlpha, isAlphaPremultiplied), sampleModel);
    }
 }
@@ -1,4 +0,0 @@
-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
@@ -1,247 +0,0 @@
-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);
-    }
-}
@@ -90,6 +90,34 @@ 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);
@@ -138,13 +166,11 @@ 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)));
@@ -153,36 +179,14 @@ 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 (but are different)...
+        // These profiles are extracted from various JPEGs, and have the exact same profile header...
        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"));

@@ -39,6 +39,8 @@ import java.io.IOException;
 import java.util.Arrays;

 import static org.junit.Assert.assertArrayEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;

 public class KCMSSanitizerStrategyTest {
@@ -1,28 +0,0 @@
-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);
-    }
-}
@@ -1,30 +0,0 @@
-package com.twelvemonkeys.imageio.stream;
-
-import org.junit.Test;
-
-import javax.imageio.spi.ImageInputStreamSpi;
-import java.io.File;
-import java.io.IOException;
-
-import static org.junit.Assert.assertNull;
-import static org.junit.Assume.assumeFalse;
-
-public class BufferedFileImageInputStreamSpiTest extends ImageInputStreamSpiTest<File> {
-    @Override
-    protected ImageInputStreamSpi createProvider() {
-        return new BufferedFileImageInputStreamSpi();
-    }
-
-    @Override
-    protected File createInput() throws IOException {
-        return File.createTempFile("test-", ".tst");
-    }
-
-    @Test
-    public void testReturnNullWhenFileDoesNotExist() throws IOException {
-        // This is really stupid behavior, but it is consistent with the JRE bundled SPIs.
-        File input = new File("a-file-that-should-not-exist-ever.fnf");
-        assumeFalse("File should not exist: " + input.getPath(), input.exists());
-        assertNull(provider.createInputStreamInstance(input));
-    }
-}
@@ -1,429 +0,0 @@
-/*
- * Copyright (c) 2020, 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.stream;
-
-import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
-
-import javax.imageio.stream.ImageInputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.file.Files;
-import java.util.Random;
-
-import static com.twelvemonkeys.imageio.stream.BufferedImageInputStreamTest.rangeEquals;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-/**
- * BufferedFileImageInputStreamTestCase
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: BufferedFileImageInputStreamTestCase.java,v 1.0 Apr 21, 2009 10:58:48 AM haraldk Exp$
- */
-public class BufferedFileImageInputStreamTest {
-    private final Random random = new Random(170984354357234566L);
-
-    private File randomDataToFile(byte[] data) throws IOException {
-        random.nextBytes(data);
-
-        File file = File.createTempFile("read", ".tmp");
-        Files.write(file.toPath(), data);
-        return file;
-    }
-
-    @Test
-    public void testCreate() throws IOException {
-        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(File.createTempFile("empty", ".tmp"))) {
-            assertEquals("Data length should be same as stream length", 0, stream.length());
-        }
-    }
-
-    @Test
-    public void testCreateNullFile() throws IOException {
-        try {
-            new BufferedFileImageInputStream((File) null);
-            fail("Expected IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            assertNotNull("Null exception message", expected.getMessage());
-            String message = expected.getMessage().toLowerCase();
-            assertTrue("Exception message does not contain parameter name", message.contains("file"));
-            assertTrue("Exception message does not contain null", message.contains("null"));
-        }
-    }
-
-    @Test
-    public void testCreateNullRAF() {
-        try {
-            new BufferedFileImageInputStream((RandomAccessFile) null);
-            fail("Expected IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            assertNotNull("Null exception message", expected.getMessage());
-            String message = expected.getMessage().toLowerCase();
-            assertTrue("Exception message does not contain parameter name", message.contains("raf"));
-            assertTrue("Exception message does not contain null", message.contains("null"));
-        }
-    }
-
-    @Test
-    public void testRead() throws IOException {
-        byte[] data = new byte[1024 * 1024];
-        File file = randomDataToFile(data);
-
-        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
-            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());
-            }
-        }
-    }
-
-    @Test
-    public void testReadArray() throws IOException {
-        byte[] data = new byte[1024 * 1024];
-        File file = randomDataToFile(data);
-
-        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
-            assertEquals("File length should be same as stream length", file.length(), stream.length());
-
-            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));
-            }
-        }
-    }
-
-    @Test
-    public void testReadSkip() throws IOException {
-        byte[] data = new byte[1024 * 14];
-        File file = randomDataToFile(data);
-
-        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
-            assertEquals("File length should be same as stream length", file.length(), stream.length());
-
-            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));
-            }
-        }
-    }
-
-    @Test
-    public void testReadSeek() throws IOException {
-        byte[] data = new byte[1024 * 18];
-        File file = randomDataToFile(data);
-
-        try (BufferedFileImageInputStream stream = new BufferedFileImageInputStream(file)) {
-            assertEquals("File length should be same as stream length", file.length(), stream.length());
-
-            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));
-            }
-        }
-    }
-
-    @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));
-        }
-    }
-
-    @Test
-    public void testReadBitRandom() throws IOException {
-        byte[] bytes = new byte[8];
-        File file = randomDataToFile(bytes);
-        long value = ByteBuffer.wrap(bytes).getLong();
-
-        // Create stream
-        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());
-            }
-        }
-    }
-
-    @Test
-    public void testReadBitsRandom() throws IOException {
-        byte[] bytes = new byte[8];
-        File file = randomDataToFile(bytes);
-        long value = ByteBuffer.wrap(bytes).getLong();
-
-        // Create stream
-        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());
-            }
-        }
-    }
-
-    @Test
-    public void testReadBitsRandomOffset() throws IOException {
-        byte[] bytes = new byte[8];
-        File file = randomDataToFile(bytes);
-        long value = ByteBuffer.wrap(bytes).getLong();
-
-        // Create stream
-        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());
-            }
-        }
-    }
-
-    @Test
-    public void testReadShort() throws IOException {
-        byte[] bytes = new byte[8743]; // Slightly more than one buffer size
-        File file = randomDataToFile(bytes);
-        ByteBuffer buffer = ByteBuffer.wrap(bytes).order(ByteOrder.BIG_ENDIAN);
-
-        try (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());
-            }
-
-            assertThrows(EOFException.class, new ThrowingRunnable() {
-                @Override
-                public void run() throws Throwable {
-                    stream.readShort();
-                }
-            });
-
-            stream.seek(0);
-            stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
-            buffer.position(0);
-            buffer.order(ByteOrder.LITTLE_ENDIAN);
-
-            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
-    public void testReadInt() throws IOException {
-        byte[] bytes = new byte[8743]; // Slightly more than one buffer size
-        File file = randomDataToFile(bytes);
-        ByteBuffer buffer = ByteBuffer.wrap(bytes).order(ByteOrder.BIG_ENDIAN);
-
-        try (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());
-            }
-
-            assertThrows(EOFException.class, new ThrowingRunnable() {
-                @Override
-                public void run() throws Throwable {
-                    stream.readInt();
-                }
-            });
-
-            stream.seek(0);
-            stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
-            buffer.position(0);
-            buffer.order(ByteOrder.LITTLE_ENDIAN);
-
-            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
-    public void testReadLong() throws IOException {
-        byte[] bytes = new byte[8743]; // Slightly more than one buffer size
-        File file = randomDataToFile(bytes);
-        ByteBuffer buffer = ByteBuffer.wrap(bytes).order(ByteOrder.BIG_ENDIAN);
-
-        try (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());
-            }
-
-            assertThrows(EOFException.class, new ThrowingRunnable() {
-                @Override
-                public void run() throws Throwable {
-                    stream.readLong();
-                }
-            });
-
-            stream.seek(0);
-            stream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
-            buffer.position(0);
-            buffer.order(ByteOrder.LITTLE_ENDIAN);
-
-            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
-    public void testSeekPastEOF() throws IOException {
-        byte[] bytes = new byte[9];
-        File file = randomDataToFile(bytes);
-
-        try (final ImageInputStream stream = new BufferedFileImageInputStream(file)) {
-            stream.seek(1000);
-
-            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();
-                }
-            });
-
-            stream.seek(0);
-            for (byte value : bytes) {
-                assertEquals(value, stream.readByte());
-            }
-
-            assertEquals(-1, stream.read());
-        }
-    }
-
-    @Test
-    public void testClose() throws IOException {
-        // Create wrapper stream
-        RandomAccessFile mock = mock(RandomAccessFile.class);
-        ImageInputStream stream = new BufferedFileImageInputStream(mock);
-
-        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);
-        }
-   }
-}
@@ -1,18 +0,0 @@
-package com.twelvemonkeys.imageio.stream;
-
-import javax.imageio.spi.ImageInputStreamSpi;
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-public class BufferedRAFImageInputStreamSpiTest extends ImageInputStreamSpiTest<RandomAccessFile> {
-    @Override
-    protected ImageInputStreamSpi createProvider() {
-        return new BufferedRAFImageInputStreamSpi();
-    }
-
-    @Override
-    protected RandomAccessFile createInput() throws IOException {
-        return new RandomAccessFile(File.createTempFile("test-", ".tst"), "r");
-    }
-}
@@ -39,11 +39,11 @@ import static com.twelvemonkeys.imageio.stream.BufferedImageInputStreamTest.rang
 import static org.junit.Assert.*;

 /**
- * ByteArrayImageInputStreamTest
+ * ByteArrayImageInputStreamTestCase
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @author last modified by $Author: haraldk$
- * @version $Id: ByteArrayImageInputStreamTest.java,v 1.0 Apr 21, 2009 10:58:48 AM haraldk Exp$
+ * @version $Id: ByteArrayImageInputStreamTestCase.java,v 1.0 Apr 21, 2009 10:58:48 AM haraldk Exp$
 */
 public class ByteArrayImageInputStreamTest {
    private final Random random = new Random(1709843507234566L);
@@ -11,14 +11,14 @@ import java.util.Locale;
 import static org.junit.Assert.*;

 abstract class ImageInputStreamSpiTest<T> {
-    protected final ImageInputStreamSpi provider = createProvider();
+    private final ImageInputStreamSpi provider = createProvider();

    @SuppressWarnings("unchecked")
-    protected final Class<T> inputClass = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+    private final Class<T> inputClass = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];

    protected abstract ImageInputStreamSpi createProvider();

-    protected abstract T createInput() throws IOException;
+    protected abstract T createInput();

    @Test
    public void testInputClass() {
@@ -45,8 +45,9 @@ import javax.imageio.spi.IIORegistry;
 import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.awt.image.SampleModel;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
@@ -56,7 +57,6 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;

-import static java.lang.Math.min;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;

@@ -97,6 +97,10 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {

    protected abstract List<String> getMIMETypes();

+    protected boolean allowsNullRawImageType() {
+        return false;
+    }
+
    protected static void failBecause(String message, Throwable exception) {
        throw new AssertionError(message, exception);
    }
@@ -217,7 +221,6 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
                    image = reader.read(i);
                }
                catch (Exception e) {
-                    e.printStackTrace();
                    failBecause(String.format("Image %s index %s could not be read: %s", data.getInput(), i, e), e);
                }

@@ -280,6 +283,26 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        reader.dispose();
    }

+    @Test
+    public void testReadNoInput() throws IOException {
+        ImageReader reader = createReader();
+        // Do not set input
+
+        BufferedImage image = null;
+        try {
+            image = reader.read(0);
+            fail("Read image with no input");
+        }
+        catch (IllegalStateException ignore) {
+        }
+        catch (IOException e) {
+            failBecause("Image could not be read", e);
+        }
+        assertNull(image);
+
+        reader.dispose();
+    }
+
    @Test
    public void testReRead() throws IOException {
        ImageReader reader = createReader();
@@ -300,71 +323,69 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        reader.dispose();
    }

-    @Test(expected = IllegalStateException.class)
-    public void testReadNoInput() throws IOException {
-        ImageReader reader = createReader();
-        // Do not set input
-
-        try {
-            reader.read(0);
-            fail("Read image with no input");
-        }
-        catch (IOException e) {
-            failBecause("Image could not be read", e);
-        }
-    }
-
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
    public void testReadIndexNegativeWithParam() throws IOException {
        ImageReader reader = createReader();
        TestData data = getTestData().get(0);
        reader.setInput(data.getInputStream());

+        BufferedImage image = null;
        try {
-            reader.read(-1, reader.getDefaultReadParam());
+            image = reader.read(-1, reader.getDefaultReadParam());
            fail("Read image with illegal index");
        }
+        catch (IndexOutOfBoundsException ignore) {
+        }
        catch (IOException e) {
            failBecause("Image could not be read", e);
        }
-        finally {
-            reader.dispose();
-        }
+
+        assertNull(image);
+
+        reader.dispose();
    }

-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
    public void testReadIndexOutOfBoundsWithParam() throws IOException {
        ImageReader reader = createReader();
        TestData data = getTestData().get(0);
        reader.setInput(data.getInputStream());

+        BufferedImage image = null;
        try {
-            reader.read(Short.MAX_VALUE, reader.getDefaultReadParam());
+            image = reader.read(Short.MAX_VALUE, reader.getDefaultReadParam());
            fail("Read image with index out of bounds");
        }
+        catch (IndexOutOfBoundsException ignore) {
+        }
        catch (IOException e) {
            failBecause("Image could not be read", e);
        }
-        finally {
-            reader.dispose();
-        }
+
+        assertNull(image);
+
+        reader.dispose();
    }

-    @Test(expected = IllegalStateException.class)
+    @Test
    public void testReadNoInputWithParam() throws IOException {
        ImageReader reader = createReader();
        // Do not set input

+        BufferedImage image = null;
        try {
-            reader.read(0, reader.getDefaultReadParam());
+            image = reader.read(0, reader.getDefaultReadParam());
            fail("Read image with no input");
        }
+        catch (IllegalStateException ignore) {
+        }
        catch (IOException e) {
            failBecause("Image could not be read", e);
        }
-        finally {
-            reader.dispose();
-        }
+
+        assertNull(image);
+
+        reader.dispose();
    }

    @Test
@@ -1151,7 +1172,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        // At least imageStarted and imageComplete, plus any number of imageProgress
        InOrder ordered = inOrder(listener);
        ordered.verify(listener).imageStarted(reader, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
        ordered.verify(listener).imageComplete(reader);
        reader.dispose();
    }
@@ -1184,9 +1205,9 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        ordered.verify(listenerToo).imageStarted(reader, 0);
        ordered.verify(listenerThree).imageStarted(reader, 0);

-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyFloat());
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyFloat());
-        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyInt());
+        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(reader), anyInt());

        ordered.verify(listener).imageComplete(reader);
        ordered.verify(listenerToo).imageComplete(reader);
@@ -1226,7 +1247,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        }

        // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
        reader.dispose();
    }

@@ -1253,11 +1274,11 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        }

        // Should not have called any methods on listener1...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);

        InOrder ordered = inOrder(listenerToo);
        ordered.verify(listenerToo).imageStarted(reader, 0);
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyFloat());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(reader), anyInt());
        ordered.verify(listenerToo).imageComplete(reader);
        reader.dispose();
    }
@@ -1281,7 +1302,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        }

        // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
        reader.dispose();
    }

@@ -1307,8 +1328,8 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        }

        // Should not have called any methods...
-        verifyNoInteractions(listener);
-        verifyNoInteractions(listenerToo);
+        verifyZeroInteractions(listener);
+        verifyZeroInteractions(listenerToo);
        reader.dispose();
    }

@@ -1333,7 +1354,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
            }
        };
        doAnswer(abort).when(abortingListener).imageStarted(any(ImageReader.class), anyInt());
-        doAnswer(abort).when(abortingListener).imageProgress(any(ImageReader.class), anyFloat());
+        doAnswer(abort).when(abortingListener).imageProgress(any(ImageReader.class), anyInt());

        reader.addIIOReadProgressListener(abortingListener);

@@ -1356,6 +1377,9 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
            reader.setInput(data.getInputStream());

            ImageTypeSpecifier rawType = reader.getRawImageType(0);
+            if (rawType == null && allowsNullRawImageType()) {
+                continue;
+            }
            assertNotNull(rawType);

            Iterator<ImageTypeSpecifier> types = reader.getImageTypes(0);
@@ -1377,7 +1401,6 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {

            assertTrue("ImageTypeSpecifier from getRawImageType should be in the iterator from getImageTypes", rawFound);
        }
-
        reader.dispose();
    }

@@ -1626,72 +1649,12 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        BufferedImage one = reader.read(0);
        BufferedImage two = reader.read(0);

-        // Test for same BufferedImage instance
        assertNotSame("Multiple reads return same (mutable) image", one, two);

-        // Test for same backing storage (array)
-        one.setRGB(0, 0, Color.BLACK.getRGB());
-        two.setRGB(0, 0, Color.WHITE.getRGB());
+        one.setRGB(0, 0, Color.BLUE.getRGB());
+        two.setRGB(0, 0, Color.RED.getRGB());
+
        assertTrue(one.getRGB(0, 0) != two.getRGB(0, 0));
-
-        reader.dispose();
-    }
-
-    @Test
-    public void testReadThumbnails() throws IOException {
-        T reader = createReader();
-
-        if (reader.readerSupportsThumbnails()) {
-            for (TestData testData : getTestData()) {
-                try (ImageInputStream inputStream = testData.getInputStream()) {
-                    reader.setInput(inputStream);
-
-                    int numImages = reader.getNumImages(true);
-
-                    for (int i = 0; i < numImages; i++) {
-                        int numThumbnails = reader.getNumThumbnails(0);
-
-                        for (int t = 0; t < numThumbnails; t++) {
-                            BufferedImage thumbnail = reader.readThumbnail(0, t);
-
-                            assertNotNull(thumbnail);
-                        }
-                    }
-                }
-            }
-        }
-
-        reader.dispose();
-    }
-
-    @Test
-    public void testThumbnailProgress() throws IOException {
-        T reader = createReader();
-
-        IIOReadProgressListener listener = mock(IIOReadProgressListener.class);
-        reader.addIIOReadProgressListener(listener);
-
-        if (reader.readerSupportsThumbnails()) {
-            for (TestData testData : getTestData()) {
-                try (ImageInputStream inputStream = testData.getInputStream()) {
-
-                    reader.setInput(inputStream);
-
-                    int numThumbnails = reader.getNumThumbnails(0);
-                    for (int i = 0; i < numThumbnails; i++) {
-                        reset(listener);
-
-                        reader.readThumbnail(0, i);
-
-                        InOrder order = inOrder(listener);
-                        order.verify(listener).thumbnailStarted(reader, 0, i);
-                        order.verify(listener, atLeastOnce()).thumbnailProgress(reader, 100f);
-                        order.verify(listener).thumbnailComplete(reader);
-                    }
-                }
-            }
-        }
-
        reader.dispose();
    }

@@ -1738,43 +1701,6 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        reader.dispose();
    }

-    protected List<TestData> getTestDataForAffineTransformOpCompatibility() {
-        // Allow subclasses to filter out test data that can't be converted to a compatible image without data loss
-        return getTestData();
-    }
-
-    @Test
-    public void testAffineTransformOpCompatibility() throws IOException {
-        // Test that the output of normal images are compatible with AffineTransformOp. Is unlikely to work on all test data
-        ImageReader reader = createReader();
-
-        for (TestData testData : getTestDataForAffineTransformOpCompatibility()) {
-            try (ImageInputStream input = testData.getInputStream()) {
-                reader.setInput(input);
-
-                ImageReadParam param = reader.getDefaultReadParam();
-                param.setSourceRegion(new Rectangle(min(reader.getWidth(0), 64), min(reader.getHeight(0), 64)));
-
-                BufferedImage originalImage = reader.read(0, param);
-
-                AffineTransform transform = AffineTransform.getTranslateInstance(10, 10);
-                AffineTransformOp op = new AffineTransformOp(transform, AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
-
-                try {
-                    BufferedImage resultImage = op.filter(originalImage, null); // The exception happens here
-                    assertNotNull(resultImage);
-                }
-                catch (ImagingOpException e) {
-                    fail(e.getMessage() + ".\n\t"
-                            + originalImage + "\n\t"
-                            + testData);
-                }
-            }
-        }
-
-        reader.dispose();
-    }
-
    @Ignore("TODO: Implement")
    @Test
    public void testSetDestinationBands() {
@@ -30,20 +30,14 @@

 package com.twelvemonkeys.imageio.util;

-import static org.junit.Assert.assertEquals;
-
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DirectColorModel;
-import java.awt.image.IndexColorModel;
-
-import javax.imageio.ImageTypeSpecifier;
-
+import com.twelvemonkeys.lang.Validate;
 import org.junit.Test;

-import com.twelvemonkeys.lang.Validate;
+import javax.imageio.ImageTypeSpecifier;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;
+
+import static org.junit.Assert.assertEquals;

 public class ImageTypeSpecifiersTest {

@@ -547,7 +541,8 @@ public class ImageTypeSpecifiersTest {
    }

    @Test
-    public void testCreatePackedGrayscale1BPP() {
+    public void testCreatePackedGrayscale1() {
+        // TODO: Fails on Java 11, because IndexColorModel now has an overloaded equals that actually tests the color entries
        assertEquals(
                ImageTypeSpecifier.createGrayscale(1, DataBuffer.TYPE_BYTE, false),
                ImageTypeSpecifiers.createPackedGrayscale(GRAY, 1, DataBuffer.TYPE_BYTE)
@@ -555,8 +550,8 @@ public class ImageTypeSpecifiersTest {
    }

    @Test
-    public void testCreatePackedGrayscale2BPP() {
-        // TODO: Fails on Java 11+, because IndexColorModel now has an overloaded equals that actually tests the color entries
+    public void testCreatePackedGrayscale2() {
+        // TODO: Fails on Java 11, because IndexColorModel now has an overloaded equals that actually tests the color entries
        assertEquals(
                ImageTypeSpecifier.createGrayscale(2, DataBuffer.TYPE_BYTE, false),
                ImageTypeSpecifiers.createPackedGrayscale(GRAY, 2, DataBuffer.TYPE_BYTE)
@@ -564,8 +559,8 @@ public class ImageTypeSpecifiersTest {
    }

    @Test
-    public void testCreatePackedGrayscale4BPP()  {
-        // TODO: Fails on Java 11+, because IndexColorModel now has an overloaded equals that actually tests the color entries
+    public void testCreatePackedGrayscale4() throws Exception {
+        // TODO: Fails on Java 11, because IndexColorModel now has an overloaded equals that actually tests the color entries
        assertEquals(
                ImageTypeSpecifier.createGrayscale(4, DataBuffer.TYPE_BYTE, false),
                ImageTypeSpecifiers.createPackedGrayscale(GRAY, 4, DataBuffer.TYPE_BYTE)
@@ -658,7 +653,7 @@ public class ImageTypeSpecifiersTest {
        for (int bits = 1; bits <= 8; bits <<= 1) {
            int[] colors = createIntLut(1 << bits);
            assertEquals(
-                    new IndexedImageTypeSpecifier(new IndexColorModel(bits, colors.length, colors, 0, false, -1, DataBuffer.TYPE_BYTE)),
+                    IndexedImageTypeSpecifier.createFromIndexColorModel(new IndexColorModel(bits, colors.length, colors, 0, false, -1, DataBuffer.TYPE_BYTE)),
                    ImageTypeSpecifiers.createIndexed(colors, false, -1, bits, DataBuffer.TYPE_BYTE)
            );
        }
@@ -668,7 +663,7 @@ public class ImageTypeSpecifiersTest {
    public void testCreateIndexedIntArray16() {
        int[] colors = createIntLut(1 << 16);
        assertEquals(
-                new IndexedImageTypeSpecifier(new IndexColorModel(16, colors.length, colors, 0, false, -1, DataBuffer.TYPE_USHORT)),
+                IndexedImageTypeSpecifier.createFromIndexColorModel(new IndexColorModel(16, colors.length, colors, 0, false, -1, DataBuffer.TYPE_USHORT)),
                ImageTypeSpecifiers.createIndexed(colors, false, -1, 16, DataBuffer.TYPE_USHORT)
        );

@@ -680,7 +675,7 @@ public class ImageTypeSpecifiersTest {
            int[] colors = createIntLut(1 << bits);
            IndexColorModel colorModel = new IndexColorModel(bits, colors.length, colors, 0, false, -1, DataBuffer.TYPE_BYTE);
            assertEquals(
-                    new IndexedImageTypeSpecifier(colorModel),
+                    IndexedImageTypeSpecifier.createFromIndexColorModel(colorModel),
                    ImageTypeSpecifiers.createFromIndexColorModel(colorModel)
            );
        }
@@ -691,7 +686,7 @@ public class ImageTypeSpecifiersTest {
        int[] colors = createIntLut(1 << 16);
        IndexColorModel colorModel = new IndexColorModel(16, colors.length, colors, 0, false, -1, DataBuffer.TYPE_USHORT);
        assertEquals(
-                new IndexedImageTypeSpecifier(colorModel),
+                IndexedImageTypeSpecifier.createFromIndexColorModel(colorModel),
                ImageTypeSpecifiers.createFromIndexColorModel(colorModel)
        );
    }
@@ -52,6 +52,7 @@ import java.net.URL;
 import java.util.List;

 import static org.junit.Assert.*;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.*;

 /**
@@ -78,7 +79,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
    protected abstract ImageWriterSpi createProvider();

    protected final T createWriter() throws IOException {
-        return writerClass.cast(provider.createWriterInstance());
+        return writerClass.cast(provider.createWriterInstance(null));
    }

    protected abstract List<? extends RenderedImage> getTestData();
@@ -103,7 +104,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {

        return image;
    }
-
+    
    protected final RenderedImage getTestData(final int index) {
        return getTestData().get(index);
    }
@@ -218,7 +219,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
        // At least imageStarted and imageComplete, plus any number of imageProgress
        InOrder ordered = inOrder(listener);
        ordered.verify(listener).imageStarted(writer, 0);
-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyInt());
        ordered.verify(listener).imageComplete(writer);
    }

@@ -250,9 +251,9 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
        ordered.verify(listenerToo).imageStarted(writer, 0);
        ordered.verify(listenerThree).imageStarted(writer, 0);

-        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyFloat());
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyFloat());
-        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(writer), anyFloat());
+        ordered.verify(listener, atLeastOnce()).imageProgress(eq(writer), anyInt());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyInt());
+        ordered.verify(listenerThree, atLeastOnce()).imageProgress(eq(writer), anyInt());

        ordered.verify(listener).imageComplete(writer);
        ordered.verify(listenerToo).imageComplete(writer);
@@ -289,7 +290,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
        }

        // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
    }

    @Test
@@ -314,12 +315,12 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
        }

        // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);

        // At least imageStarted and imageComplete, plus any number of imageProgress
        InOrder ordered = inOrder(listenerToo);
        ordered.verify(listenerToo).imageStarted(writer, 0);
-        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyFloat());
+        ordered.verify(listenerToo, atLeastOnce()).imageProgress(eq(writer), anyInt());
        ordered.verify(listenerToo).imageComplete(writer);

    }
@@ -344,7 +345,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
        }

        // Should not have called any methods...
-        verifyNoInteractions(listener);
+        verifyZeroInteractions(listener);
    }

    @Test
@@ -370,7 +371,7 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
        }

        // Should not have called any methods...
-        verifyNoInteractions(listener);
-        verifyNoInteractions(listenerToo);
+        verifyZeroInteractions(listener);
+        verifyZeroInteractions(listenerToo);
    }
 }
@@ -30,17 +30,14 @@

 package com.twelvemonkeys.imageio.util;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import org.junit.Test;

+import javax.imageio.ImageTypeSpecifier;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBuffer;
 import java.awt.image.IndexColorModel;

-import javax.imageio.ImageTypeSpecifier;
-
-import org.junit.Test;
+import static org.junit.Assert.*;

 /**
 * IndexedImageTypeSpecifierTestCase
@@ -54,43 +51,46 @@ public class IndexedImageTypeSpecifierTest {
    public void testEquals() {
        IndexColorModel cm = new IndexColorModel(1, 2, new int[]{0xffffff, 0x00}, 0, false, -1, DataBuffer.TYPE_BYTE);

-        ImageTypeSpecifier spec = new IndexedImageTypeSpecifier(cm);
-        ImageTypeSpecifier other = new IndexedImageTypeSpecifier(cm);
-        ImageTypeSpecifier different = new IndexedImageTypeSpecifier(new IndexColorModel(2, 2, new int[]{0xff00ff, 0x00, 0xff00ff, 0x00}, 0, false, -1, DataBuffer.TYPE_BYTE));
+        ImageTypeSpecifier spec = IndexedImageTypeSpecifier.createFromIndexColorModel(cm);
+        ImageTypeSpecifier other = IndexedImageTypeSpecifier.createFromIndexColorModel(cm);
+        ImageTypeSpecifier different = IndexedImageTypeSpecifier.createFromIndexColorModel(new IndexColorModel(2, 2, new int[]{0xff00ff, 0x00, 0xff00ff, 0x00}, 0, false, -1, DataBuffer.TYPE_BYTE));

        assertEquals(spec, other);
        assertEquals(other, spec);

        assertEquals(spec.hashCode(), other.hashCode());

+        assertTrue(spec.equals(other));
+        assertTrue(other.equals(spec));
+
        // TODO: There is still a problem that IndexColorModel does not override equals,
        // so any model with the same number of bits, transparency, and transfer type will be treated as equal
-        assertNotEquals(other, different);
+        assertFalse(other.equals(different));
    }

    @Test
    public void testHashCode() {
        IndexColorModel cm = new IndexColorModel(1, 2, new int[]{0xffffff, 0x00}, 0, false, -1, DataBuffer.TYPE_BYTE);

-        ImageTypeSpecifier spec = new IndexedImageTypeSpecifier(cm);
-        ImageTypeSpecifier other = new IndexedImageTypeSpecifier(cm);
-        ImageTypeSpecifier different = new IndexedImageTypeSpecifier(new IndexColorModel(2, 2, new int[]{0xff00ff, 0x00, 0xff00ff, 0x00}, 0, false, -1, DataBuffer.TYPE_BYTE));
+        ImageTypeSpecifier spec = IndexedImageTypeSpecifier.createFromIndexColorModel(cm);
+        ImageTypeSpecifier other = IndexedImageTypeSpecifier.createFromIndexColorModel(cm);
+        ImageTypeSpecifier different = IndexedImageTypeSpecifier.createFromIndexColorModel(new IndexColorModel(2, 2, new int[]{0xff00ff, 0x00, 0xff00ff, 0x00}, 0, false, -1, DataBuffer.TYPE_BYTE));

        // TODO: There is still a problem that IndexColorModel does not override hashCode,
        // so any model with the same number of bits, transparency, and transfer type will have same hash
        assertEquals(spec.hashCode(), other.hashCode());
-        assertNotEquals(spec.hashCode(), different.hashCode());
+        assertFalse(spec.hashCode() == different.hashCode());
    }

    @Test(expected = IllegalArgumentException.class)
    public void testCreateNull() {
-        new IndexedImageTypeSpecifier(null);
+        IndexedImageTypeSpecifier.createFromIndexColorModel(null);
    }

    @Test
    public void testCreateBufferedImageBinary() {
        IndexColorModel cm = new IndexColorModel(1, 2, new int[]{0xffffff, 0x00}, 0, false, -1, DataBuffer.TYPE_BYTE);
-        ImageTypeSpecifier spec = new IndexedImageTypeSpecifier(cm);
+        ImageTypeSpecifier spec = IndexedImageTypeSpecifier.createFromIndexColorModel(cm);

        BufferedImage image = spec.createBufferedImage(2, 2);

@@ -102,7 +102,7 @@ public class IndexedImageTypeSpecifierTest {
    @Test
    public void testCreateBufferedImageIndexed() {
        IndexColorModel cm = new IndexColorModel(8, 256, new int[256], 0, false, -1, DataBuffer.TYPE_BYTE);
-        ImageTypeSpecifier spec = new IndexedImageTypeSpecifier(cm);
+        ImageTypeSpecifier spec = IndexedImageTypeSpecifier.createFromIndexColorModel(cm);

        BufferedImage image = spec.createBufferedImage(2, 2);

@@ -1,199 +0,0 @@
-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));
-                }
-            }
-        }
-    }
-}
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-hdr</artifactId>
    <name>TwelveMonkeys :: ImageIO :: HDR plugin</name>
@@ -12,10 +12,6 @@
        ImageIO plugin for Radiance RGBE High Dynaimc Range format (HDR).
    </description>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.hdr</project.jpms.module.name>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
@@ -38,14 +38,12 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

-import static java.util.Collections.emptyList;
-
 /**
- * HDRImageReaderTest
+ * TGAImageReaderTest
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @author last modified by $Author: haraldk$
- * @version $Id: HDRImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$
+ * @version $Id: TGAImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$
 */
 public class HDRImageReaderTest extends ImageReaderAbstractTest<HDRImageReader> {
    @Override
@@ -60,12 +58,6 @@ public class HDRImageReaderTest extends ImageReaderAbstractTest<HDRImageReader>
        );
    }

-    @Override
-    protected List<TestData> getTestDataForAffineTransformOpCompatibility() {
-        // HDR images uses floating point buffers...
-        return emptyList();
-    }
-
    @Override
    protected List<String> getFormatNames() {
        return Arrays.asList("HDR", "hdr", "RGBE", "rgbe");
@@ -4,16 +4,12 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-icns</artifactId>
    <name>TwelveMonkeys :: ImageIO :: ICNS plugin</name>
    <description>ImageIO plugin for Apple Icon Image (ICNS) format.</description>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.icns</project.jpms.module.name>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.8.2</version>
+        <version>3.6.5-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-iff</artifactId>
    <name>TwelveMonkeys :: ImageIO :: IFF plugin</name>
@@ -13,10 +13,6 @@
        type ILBM and PBM format.
    </description>

-    <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.iff</project.jpms.module.name>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
@@ -69,14 +69,14 @@ abstract class AbstractMultiPaletteChunk extends IFFChunk implements MultiPalett
    protected WeakReference<IndexColorModel> originalPalette;
    protected MutableIndexColorModel mutablePalette;

-    public AbstractMultiPaletteChunk(int chunkId, int chunkLength) {
-        super(chunkId, chunkLength);
+    public AbstractMultiPaletteChunk(int pChunkId, int pChunkLength) {
+        super(pChunkId, pChunkLength);
    }

    @Override
-    void readChunk(final DataInput input) throws IOException {
+    void readChunk(final DataInput pInput) throws IOException {
        if (chunkId == IFF.CHUNK_SHAM) {
-            input.readUnsignedShort(); // Version, typically 0, skipped
+            pInput.readUnsignedShort(); // Version, typically 0, skipped
        }

        int rows = chunkLength / 32;    /* sizeof(word) * 16 */
@@ -91,7 +91,7 @@ abstract class AbstractMultiPaletteChunk extends IFFChunk implements MultiPalett
            }

            for (int i = 0; i < 16; i++ ) {
-                int data = input.readUnsignedShort();
+                int data = pInput.readUnsignedShort();

                changes[row][i].index = i;
                changes[row][i].r = (byte) (((data & 0x0f00) >> 8) * FACTOR_4BIT);
@@ -102,15 +102,14 @@ abstract class AbstractMultiPaletteChunk extends IFFChunk implements MultiPalett
    }

    @Override
-    void writeChunk(DataOutput output) {
+    void writeChunk(DataOutput pOutput) throws IOException {
        throw new UnsupportedOperationException("Method writeChunk not implemented");
    }


-    @Override
    public ColorModel getColorModel(final IndexColorModel colorModel, final int rowIndex, final boolean laced) {
        if (rowIndex < lastRow || mutablePalette == null || originalPalette != null && originalPalette.get() != colorModel) {
-            originalPalette = new WeakReference<>(colorModel);
+            originalPalette = new WeakReference<IndexColorModel>(colorModel);
            mutablePalette = new MutableIndexColorModel(colorModel);

            if (initialChanges != null) {
@@ -109,68 +109,64 @@ final class BMHDChunk extends IFFChunk {
    int pageWidth;
    int pageHeight;

-    BMHDChunk(int chunkLength) {
-        super(IFF.CHUNK_BMHD, chunkLength);
+    protected BMHDChunk(int pChunkLength) {
+        super(IFF.CHUNK_BMHD, pChunkLength);
    }

-    BMHDChunk(int width, int height, int bitplanes, int maskType, int compressionType, int transparentIndex) {
+    protected BMHDChunk(int pWidth, int pHeight, int pBitplanes, int pMaskType, int pCompressionType, int pTransparentIndex) {
        super(IFF.CHUNK_BMHD, 20);
-        this.width = width;
-        this.height = height;
+        width = pWidth;
+        height = pHeight;
        xPos = 0;
        yPos = 0;
-        this.bitplanes = bitplanes;
-        this.maskType = maskType;
-        this.compressionType = compressionType;
-        this.transparentIndex = transparentIndex;
+        bitplanes = pBitplanes;
+        maskType = pMaskType;
+        compressionType = pCompressionType;
+        transparentIndex = pTransparentIndex;
        xAspect = 1;
        yAspect = 1;
-        pageWidth = Math.min(width, Short.MAX_VALUE); // For some reason, these are signed?
-        pageHeight = Math.min(height, Short.MAX_VALUE);
+        pageWidth = Math.min(pWidth, Short.MAX_VALUE); // For some reason, these are signed?
+        pageHeight = Math.min(pHeight, Short.MAX_VALUE);
    }

-    @Override
-    void readChunk(final DataInput input) throws IOException {
+    void readChunk(DataInput pInput) throws IOException {
        if (chunkLength != 20) {
            throw new IIOException("Unknown BMHD chunk length: " + chunkLength);
        }
-
-        width = input.readUnsignedShort();
-        height = input.readUnsignedShort();
-        xPos = input.readShort();
-        yPos = input.readShort();
-        bitplanes = input.readUnsignedByte();
-        maskType = input.readUnsignedByte();
-        compressionType = input.readUnsignedByte();
-        input.readByte(); // PAD
-        transparentIndex = input.readUnsignedShort();
-        xAspect = input.readUnsignedByte();
-        yAspect = input.readUnsignedByte();
-        pageWidth = input.readShort();
-        pageHeight = input.readShort();
+        width = pInput.readUnsignedShort();
+        height = pInput.readUnsignedShort();
+        xPos = pInput.readShort();
+        yPos = pInput.readShort();
+        bitplanes = pInput.readUnsignedByte();
+        maskType = pInput.readUnsignedByte();
+        compressionType = pInput.readUnsignedByte();
+        pInput.readByte(); // PAD
+        transparentIndex = pInput.readUnsignedShort();
+        xAspect = pInput.readUnsignedByte();
+        yAspect = pInput.readUnsignedByte();
+        pageWidth = pInput.readShort();
+        pageHeight = pInput.readShort();
    }

-    @Override
-    void writeChunk(final DataOutput output) throws IOException {
-        output.writeInt(chunkId);
-        output.writeInt(chunkLength);
+    void writeChunk(DataOutput pOutput) throws IOException {
+        pOutput.writeInt(chunkId);
+        pOutput.writeInt(chunkLength);

-        output.writeShort(width);
-        output.writeShort(height);
-        output.writeShort(xPos);
-        output.writeShort(yPos);
-        output.writeByte(bitplanes);
-        output.writeByte(maskType);
-        output.writeByte(compressionType);
-        output.writeByte(0); // PAD
-        output.writeShort(transparentIndex);
-        output.writeByte(xAspect);
-        output.writeByte(yAspect);
-        output.writeShort(pageWidth);
-        output.writeShort(pageHeight);
+        pOutput.writeShort(width);
+        pOutput.writeShort(height);
+        pOutput.writeShort(xPos);
+        pOutput.writeShort(yPos);
+        pOutput.writeByte(bitplanes);
+        pOutput.writeByte(maskType);
+        pOutput.writeByte(compressionType);
+        pOutput.writeByte(0); // PAD
+        pOutput.writeShort(transparentIndex);
+        pOutput.writeByte(xAspect);
+        pOutput.writeByte(yAspect);
+        pOutput.writeShort(pageWidth);
+        pOutput.writeShort(pageHeight);
    }

-    @Override
    public String toString() {
        return super.toString()
                + " {w=" + width + ", h=" + height
@@ -32,8 +32,7 @@ package com.twelvemonkeys.imageio.plugins.iff;

 import java.io.DataInput;
 import java.io.DataOutput;
-
-import static com.twelvemonkeys.lang.Validate.isTrue;
+import java.io.IOException;

 /**
 * BODYChunk
@@ -42,20 +41,15 @@ import static com.twelvemonkeys.lang.Validate.isTrue;
 * @version $Id: BODYChunk.java,v 1.0 28.feb.2006 01:25:49 haku Exp$
 */
 final class BODYChunk extends IFFChunk {
-    final long chunkOffset;
-
-    BODYChunk(int chunkId, int chunkLength, long chunkOffset) {
-        super(isTrue(chunkId == IFF.CHUNK_BODY || chunkId == IFF.CHUNK_DBOD, chunkId, "Illegal body chunk: '%s'"), chunkLength);
-        this.chunkOffset = chunkOffset;
+    protected BODYChunk(int pChunkLength) {
+        super(IFF.CHUNK_BODY, pChunkLength);
    }

-    @Override
-    void readChunk(final DataInput input) {
+    void readChunk(DataInput pInput) throws IOException {
        throw new InternalError("BODY chunk should only be read from IFFImageReader");
    }

-    @Override
-    void writeChunk(final DataOutput output)  {
+    void writeChunk(DataOutput pOutput) throws IOException {
        throw new InternalError("BODY chunk should only be written from IFFImageWriter");
    }
 }
@@ -46,23 +46,21 @@ final class CAMGChunk extends IFFChunk {
    // #define CAMG_HAM 0x800   /* hold and modify */
    // #define CAMG_EHB 0x80    /* extra halfbrite */

-    int camg;
+    private int camg;

-    CAMGChunk(int chunkLength) {
-        super(IFF.CHUNK_CAMG, chunkLength);
+    public CAMGChunk(int pLength) {
+        super(IFF.CHUNK_CAMG, pLength);
    }

-    @Override
-    void readChunk(final DataInput input) throws IOException {
+    void readChunk(DataInput pInput) throws IOException {
        if (chunkLength != 4) {
            throw new IIOException("Unknown CAMG chunk length: " + chunkLength);
        }

-        camg = input.readInt();
+        camg = pInput.readInt();
    }

-    @Override
-    void writeChunk(final DataOutput output) {
+    void writeChunk(DataOutput pOutput) throws IOException {
        throw new InternalError("Not implemented: writeChunk()");
    }

@@ -82,7 +80,6 @@ final class CAMGChunk extends IFFChunk {
        return (camg & 0x80) != 0;
    }

-    @Override
    public String toString() {
        return super.toString() + " {mode=" + (isHAM() ? "HAM" : isEHB() ? "EHB" : "Normal") + "}";
    }
@@ -31,7 +31,9 @@
 package com.twelvemonkeys.imageio.plugins.iff;

 import javax.imageio.IIOException;
+import java.awt.image.BufferedImage;
 import java.awt.image.IndexColorModel;
+import java.awt.image.WritableRaster;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -57,7 +59,7 @@ final class CMAPChunk extends IFFChunk {

    private IndexColorModel model;

-    CMAPChunk(final int pChunkLength) {
+    protected CMAPChunk(final int pChunkLength) {
        super(IFF.CHUNK_CMAP, pChunkLength);
    }

@@ -66,8 +68,7 @@ final class CMAPChunk extends IFFChunk {
        model = pModel;
    }

-    @Override
-    void readChunk(final DataInput input) throws IOException {
+    void readChunk(final DataInput pInput) throws IOException {
        int numColors = chunkLength / 3;

        reds = new byte[numColors];
@@ -75,9 +76,9 @@ final class CMAPChunk extends IFFChunk {
        blues = reds.clone();

        for (int i = 0; i < numColors; i++) {
-            reds[i] = input.readByte();
-            greens[i] = input.readByte();
-            blues[i] = input.readByte();
+            reds[i] = pInput.readByte();
+            greens[i] = pInput.readByte();
+            blues[i] = pInput.readByte();
        }

        // TODO: When reading in a CMAP for 8-bit-per-gun display or
@@ -90,38 +91,50 @@ final class CMAPChunk extends IFFChunk {

        // All chunks are WORD aligned (even sized), may need to read pad...
        if (chunkLength % 2 != 0) {
-            input.readByte();
+            pInput.readByte();
        }
    }

-    @Override
-    void writeChunk(final DataOutput output) throws IOException {
-        output.writeInt(chunkId);
-        output.writeInt(chunkLength);
+    void writeChunk(final DataOutput pOutput) throws IOException {
+        pOutput.writeInt(chunkId);
+        pOutput.writeInt(chunkLength);

        final int length = model.getMapSize();

        for (int i = 0; i < length; i++) {
-            output.writeByte(model.getRed(i));
-            output.writeByte(model.getGreen(i));
-            output.writeByte(model.getBlue(i));
+            pOutput.writeByte(model.getRed(i));
+            pOutput.writeByte(model.getGreen(i));
+            pOutput.writeByte(model.getBlue(i));
        }

        if (chunkLength % 2 != 0) {
-            output.writeByte(0); // PAD
+            pOutput.writeByte(0); // PAD
        }
    }

-    @Override
    public String toString() {
        return super.toString() + " {colorMap=" + model + "}";
    }

-    public IndexColorModel getIndexColorModel(final Form.ILBMForm header) throws IIOException {
+    BufferedImage createPaletteImage(final BMHDChunk header, boolean isEHB) throws IIOException {
+        // Create a 1 x colors.length image
+        IndexColorModel cm = getIndexColorModel(header, isEHB);
+        WritableRaster raster = cm.createCompatibleWritableRaster(cm.getMapSize(), 1);
+        byte[] pixel = null;
+
+        for (int x = 0; x < cm.getMapSize(); x++) {
+            pixel = (byte[]) cm.getDataElements(cm.getRGB(x), pixel);
+            raster.setDataElements(x, 0, pixel);
+        }
+
+        return new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
+    }
+
+    public IndexColorModel getIndexColorModel(final BMHDChunk header, boolean isEHB) throws IIOException {
        if (model == null) {
            int numColors = reds.length; // All arrays are same size

-            if (header.isEHB()) {
+            if (isEHB) {
                if (numColors == 32) {
                    reds = Arrays.copyOf(reds,  numColors * 2);
                    blues = Arrays.copyOf(blues,  numColors * 2);
@@ -144,10 +157,8 @@ final class CMAPChunk extends IFFChunk {
            // Would it work to double to numbers of colors, and create an indexcolormodel,
            // with alpha, where all colors above the original color is all transparent?
            // This is a waste of time and space, of course...
-            int transparent = header.transparentIndex();
-            int bitplanes = header.bitplanes() == 25 ? 8 : header.bitplanes();
-
-            model = new IndexColorModel(bitplanes, reds.length, reds, greens, blues, transparent); // https://github.com/haraldk/TwelveMonkeys/issues/15
+            int transparent = header.maskType == BMHDChunk.MASK_TRANSPARENT_COLOR ? header.transparentIndex : -1;
+            model = new IndexColorModel(header.bitplanes, reds.length, reds, greens, blues, transparent); // https://github.com/haraldk/TwelveMonkeys/issues/15
        }

        return model;
@@ -38,7 +38,7 @@ package com.twelvemonkeys.imageio.plugins.iff;
 * @version $Id: CTBLChunk.java,v 1.0 30.03.12 14:53 haraldk Exp$
 */
 final class CTBLChunk extends AbstractMultiPaletteChunk {
-    CTBLChunk(int chunkLength) {
-        super(IFF.CHUNK_CTBL, chunkLength);
+    protected CTBLChunk(int pChunkLength) {
+        super(IFF.CHUNK_CTBL, pChunkLength);
    }
 }
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2022, 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.iff;
-
-import javax.imageio.IIOException;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * DGBLChunk
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: DGBLChunk.java,v 1.0 28.feb.2006 02:10:07 haku Exp$
- */
-final class DGBLChunk extends IFFChunk {
-
-    /*
-    //
-    struct DGBL = {
-//
-// Size of source display
-//
-      UWORD  DisplayWidth,DisplayHeight;
-//
-// Type of compression
-//
-      UWORD  Compression;
-//
-// Pixel aspect, a ration w:h
-//
-      UBYTE  xAspect,yAspect;
-    };
-
-     */
-    int displayWidth;
-    int displayHeight;
-    int compressionType;
-    int xAspect;
-    int yAspect;
-
-    DGBLChunk(int chunkLength) {
-        super(IFF.CHUNK_DGBL, chunkLength);
-    }
-
-    @Override
-    void readChunk(final DataInput input) throws IOException {
-        if (chunkLength != 8) {
-            throw new IIOException("Unknown DBGL chunk length: " + chunkLength);
-        }
-
-        displayWidth = input.readUnsignedShort();
-        displayHeight = input.readUnsignedShort();
-        compressionType = input.readUnsignedShort();
-        xAspect = input.readUnsignedByte();
-        yAspect = input.readUnsignedByte();
-    }
-
-    @Override
-    void writeChunk(final DataOutput output) {
-        throw new InternalError("Not implemented: writeChunk()");
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() +
-                "{displayWidth=" + displayWidth +
-                ", displayHeight=" + displayHeight +
-                ", compression=" + compressionType +
-                ", xAspect=" + xAspect +
-                ", yAspect=" + yAspect +
-                '}';
-    }
-}
@@ -1,103 +0,0 @@
-package com.twelvemonkeys.imageio.plugins.iff;
-
-import javax.imageio.IIOException;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Arrays;
-
-/**
- * DPELChunk.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: DPELChunk.java,v 1.0 01/02/2022 haraldk Exp$
- */
-final class DPELChunk extends IFFChunk {
-    /*
-//
-//   Chunk DPEL
-//   ----------
-    struct DPEL = {
-//
-// Number of pixel components
-//
-ULONG nElements;
-    //
-// The TypeDepth structure is repeated nElement times to identify
-// the content of every pixel.  Pixels will always be padded to
-// byte boundaries.  The DBOD chunk will be padded to an even
-// longword boundary.
-//
-    struct TypeDepth = {
-//
-// Type of data
-//
-UWORD cType;
-    //
-// Bit depth of this type
-//
-    UWORD cBitDepth;
-} typedepth[Nelements];
-        };
-     */
-    TypeDepth[] typeDepths;
-
-    DPELChunk(final int chunkLength) {
-        super(IFF.CHUNK_DPEL, chunkLength);
-    }
-
-    @Override
-    void readChunk(final DataInput input) throws IOException {
-        int components = input.readInt(); // Strictly, it's unsigned, but that many components is unlikely...
-
-        if (chunkLength != 4 + components * 4) {
-            throw new IIOException("Unsupported DPEL chunk length: " + chunkLength);
-        }
-
-        typeDepths = new TypeDepth[components];
-
-        for (int i = 0; i < components; i++) {
-            typeDepths[i] = new TypeDepth(input.readUnsignedShort(), input.readUnsignedShort());
-        }
-    }
-
-    @Override
-    void writeChunk(final DataOutput output) {
-        throw new InternalError("Not implemented: writeChunk()");
-    }
-
-    @Override
-    public String toString() {
-        return super.toString()
-                + "{typeDepths=" + Arrays.toString(typeDepths) + '}';
-    }
-
-    public int bitsPerPixel() {
-        int bitCount = 0;
-
-        for (TypeDepth typeDepth : typeDepths) {
-            bitCount += typeDepth.bitDepth;
-        }
-
-        return bitCount;
-    }
-
-    static class TypeDepth {
-        final int type;
-        final int bitDepth;
-
-        TypeDepth(final int type, final int bitDepth) {
-            this.type = type;
-            this.bitDepth = bitDepth;
-        }
-
-        @Override
-        public String toString() {
-            return "TypeDepth{" +
-                    "type=" + type +
-                    ", bits=" + bitDepth +
-                    '}';
-        }
-    }
-}
@@ -1,421 +0,0 @@
-package com.twelvemonkeys.imageio.plugins.iff;
-
-import javax.imageio.IIOException;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.IndexColorModel;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.twelvemonkeys.imageio.plugins.iff.IFFUtil.toChunkStr;
-
-/**
- * Form.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: Form.java,v 1.0 31/01/2022 haraldk Exp$
- */
-abstract class Form {
-
-    final int formType;
-    final List<GenericChunk> meta = new ArrayList<>();
-
-    Form(int formType) {
-        this.formType = formType;
-    }
-
-    abstract int width();
-    abstract int height();
-    abstract float aspect();
-    abstract int bitplanes();
-    abstract int compressionType();
-
-    boolean isMultiPalette() {
-        return false;
-    }
-
-    boolean isHAM() {
-        return false;
-    }
-
-    public boolean premultiplied() {
-        return false;
-    }
-
-    public int sampleSize() {
-        return 1;
-    }
-
-    public int transparentIndex() {
-        return -1;
-    }
-
-    public IndexColorModel colorMap() throws IIOException {
-        return null;
-    }
-
-    public ColorModel colorMapForRow(IndexColorModel colorModel, int row) {
-        throw new UnsupportedOperationException();
-    }
-
-    public abstract boolean hasThumbnail();
-
-    public abstract int thumbnailWidth();
-
-    public abstract int thumbnailHeight();
-
-    public abstract BufferedImage thumbnail();
-
-    abstract long bodyOffset();
-    abstract long bodyLength();
-
-    @Override
-    public String toString() {
-        return toChunkStr(formType);
-    }
-
-    Form with(final IFFChunk chunk) throws IIOException {
-        if (chunk instanceof GenericChunk) {
-            // TODO: This feels kind of hackish, as it breaks the immutable design, perhaps we should just reconsider...
-            meta.add((GenericChunk) chunk);
-
-            return this;
-        }
-
-        throw new IllegalArgumentException(chunk + " not supported in FORM type " + toChunkStr(formType));
-    }
-
-    static Form ofType(int formType) {
-        switch (formType) {
-            case IFF.TYPE_ACBM:
-            case IFF.TYPE_ILBM:
-            case IFF.TYPE_PBM:
-            case IFF.TYPE_RGB8:
-                return new ILBMForm(formType);
-            case IFF.TYPE_DEEP:
-            case IFF.TYPE_TVPP:
-                return new DEEPForm(formType);
-            default:
-                throw new IllegalArgumentException("FORM type " + toChunkStr(formType) + " not supported");
-        }
-    }
-
-    /**
-     * The set of chunks used in the "original" ILBM,
-     * and also ACBM, PBM and RGB8 FORMs.
-     */
-    static final class ILBMForm extends Form {
-        private final BMHDChunk bitmapHeader;
-        private final CAMGChunk viewMode;
-        private final CMAPChunk colorMap;
-        private final AbstractMultiPaletteChunk multiPalette;
-        private final XS24Chunk thumbnail; // TVPaint puts these into normal IFF ILBM 24 bit files as well as DEEP/TVPP
-        private final BODYChunk body;
-
-        ILBMForm(int formType) {
-            this(formType, null, null, null, null, null, null);
-        }
-
-        private ILBMForm(final int formType, final BMHDChunk bitmapHeader, final CAMGChunk viewMode, final CMAPChunk colorMap, final AbstractMultiPaletteChunk multiPalette, final XS24Chunk thumbnail, final BODYChunk body) {
-            super(formType);
-            this.bitmapHeader = bitmapHeader;
-            this.viewMode = viewMode;
-            this.colorMap = colorMap;
-            this.multiPalette = multiPalette;
-            this.thumbnail = thumbnail;
-            this.body = body;
-        }
-
-        @Override
-        int width() {
-            return bitmapHeader.width;
-        }
-
-        @Override
-        int height() {
-            return bitmapHeader.height;
-        }
-
-        @Override
-        int bitplanes() {
-            return bitmapHeader.bitplanes;
-        }
-
-        @Override
-        int compressionType() {
-            return bitmapHeader.compressionType;
-        }
-
-        @Override
-        float aspect() {
-            return bitmapHeader.yAspect == 0 ? 0 : (bitmapHeader.xAspect / (float) bitmapHeader.yAspect);
-        }
-
-        @Override
-        boolean isMultiPalette() {
-            return multiPalette != null;
-        }
-
-        boolean isEHB() {
-            return viewMode != null && viewMode.isEHB();
-        }
-
-        @Override
-        boolean isHAM() {
-            return viewMode != null && viewMode.isHAM();
-        }
-
-        boolean isLaced() {
-            return viewMode != null && viewMode.isLaced();
-        }
-
-        @Override
-        public int transparentIndex() {
-            return bitmapHeader.maskType == BMHDChunk.MASK_TRANSPARENT_COLOR ? bitmapHeader.transparentIndex : -1;
-        }
-
-        @Override
-        public IndexColorModel colorMap() throws IIOException {
-            return colorMap != null ? colorMap.getIndexColorModel(this) : null;
-        }
-
-        @Override
-        public ColorModel colorMapForRow(final IndexColorModel colorModel, final int row) {
-            return multiPalette != null ? multiPalette.getColorModel(colorModel, row, isLaced()) : null;
-        }
-
-        @Override
-        public boolean hasThumbnail() {
-            return thumbnail != null;
-        }
-
-        @Override
-        public int thumbnailWidth() {
-            return thumbnail != null ? thumbnail.width : -1;
-        }
-
-        @Override
-        public int thumbnailHeight() {
-            return thumbnail != null ? thumbnail.height : -1;
-        }
-
-        @Override
-        public BufferedImage thumbnail() {
-            return thumbnail != null ? thumbnail.thumbnail() : null;
-        }
-
-        @Override
-        long bodyOffset() {
-            return body.chunkOffset;
-        }
-
-        @Override
-        long bodyLength() {
-            return body.chunkLength;
-        }
-
-        @Override
-        ILBMForm with(final IFFChunk chunk) throws IIOException {
-            if (chunk instanceof BMHDChunk) {
-                if (bitmapHeader != null) {
-                    throw new IIOException("Multiple BMHD chunks not allowed");
-                }
-
-                return new ILBMForm(formType, (BMHDChunk) chunk, null, colorMap, multiPalette, thumbnail, body);
-            }
-            else if (chunk instanceof CAMGChunk) {
-                if (viewMode != null) {
-                    throw new IIOException("Multiple CAMG chunks not allowed");
-                }
-
-                return new ILBMForm(formType, bitmapHeader, (CAMGChunk) chunk, colorMap, multiPalette, thumbnail, body);
-            }
-            else if (chunk instanceof CMAPChunk) {
-                if (colorMap != null) {
-                    throw new IIOException("Multiple CMAP chunks not allowed");
-                }
-
-                return new ILBMForm(formType, bitmapHeader, viewMode, (CMAPChunk) chunk, multiPalette, thumbnail, body);
-            }
-            else if (chunk instanceof AbstractMultiPaletteChunk) {
-                // NOTE: We prefer PHCG over SHAM/CTBL style palette changes, if both are present
-                if (multiPalette instanceof PCHGChunk) {
-                    if (chunk instanceof PCHGChunk) {
-                        throw new IIOException("Multiple PCHG/SHAM/CTBL chunks not allowed");
-                    }
-
-                    return this;
-                }
-
-                return new ILBMForm(formType, bitmapHeader, viewMode, colorMap, (AbstractMultiPaletteChunk) chunk, thumbnail, body);
-            }
-            else if (chunk instanceof XS24Chunk) {
-                if (thumbnail != null) {
-                    throw new IIOException("Multiple XS24 chunks not allowed");
-                }
-
-                return new ILBMForm(formType, bitmapHeader, viewMode, colorMap, multiPalette, (XS24Chunk) chunk, body);
-            }
-            else if (chunk instanceof BODYChunk) {
-                if (body != null) {
-                    throw new IIOException("Multiple " + toChunkStr(chunk.chunkId) + " chunks not allowed");
-                }
-
-                return new ILBMForm(formType, bitmapHeader, viewMode, colorMap, multiPalette, thumbnail, (BODYChunk) chunk);
-            }
-            else if (chunk instanceof GRABChunk) {
-                // Ignored for now
-                return this;
-            }
-
-            return (ILBMForm) super.with(chunk);
-        }
-
-        @Override
-        public String toString() {
-            return super.toString() + '{' + bitmapHeader +
-                    (viewMode != null ? ", " + viewMode : "" ) +
-                    (colorMap != null ? ", " + colorMap : "" ) +
-                    (multiPalette != null ? ", " + multiPalette : "" ) +
-                    '}';
-        }
-    }
-
-    /**
-     * The set of chunks used in DEEP and TVPP FORMs.
-     */
-    private static final class DEEPForm extends Form {
-        private final DGBLChunk deepGlobal;
-        private final DLOCChunk deepLocation;
-        private final DPELChunk deepPixel;
-        private final XS24Chunk thumbnail;
-        private final BODYChunk body;
-
-        DEEPForm(int formType) {
-            this(formType, null, null, null, null, null);
-        }
-
-        private DEEPForm(final int formType, final DGBLChunk deepGlobal, final DLOCChunk deepLocation, final DPELChunk deepPixel, final XS24Chunk thumbnail, final BODYChunk body) {
-            super(formType);
-            this.deepGlobal = deepGlobal;
-            this.deepLocation = deepLocation;
-            this.deepPixel = deepPixel;
-            this.thumbnail = thumbnail;
-            this.body = body;
-        }
-
-
-        @Override
-        int width() {
-            return deepLocation.width;
-        }
-
-        @Override
-        int height() {
-            return deepLocation.height;
-        }
-
-        @Override
-        int bitplanes() {
-            return deepPixel.bitsPerPixel();
-        }
-
-        @Override
-        public int sampleSize() {
-            return bitplanes() / 8;
-        }
-
-        @Override
-        public boolean premultiplied() {
-            return true;
-        }
-
-        @Override
-        int compressionType() {
-            return deepGlobal.compressionType;
-        }
-
-        @Override
-        float aspect() {
-            return deepGlobal.yAspect == 0 ? 0 : deepGlobal.xAspect / (float) deepGlobal.yAspect;
-        }
-
-        @Override
-        public boolean hasThumbnail() {
-            return thumbnail != null;
-        }
-
-        @Override
-        public int thumbnailWidth() {
-            return thumbnail != null ? thumbnail.width : -1;
-        }
-
-        @Override
-        public int thumbnailHeight() {
-            return thumbnail != null ? thumbnail.height : -1;
-        }
-
-        @Override
-        public BufferedImage thumbnail() {
-            return thumbnail != null ? thumbnail.thumbnail() : null;
-        }
-
-        @Override
-        long bodyOffset() {
-            return body.chunkOffset;
-        }
-
-        @Override
-        long bodyLength() {
-            return body.chunkLength;
-        }
-
-        @Override
-        DEEPForm with(final IFFChunk chunk) throws IIOException {
-            if (chunk instanceof DGBLChunk) {
-                if (deepGlobal != null) {
-                    throw new IIOException("Multiple DGBL chunks not allowed");
-                }
-
-                return new DEEPForm(formType, (DGBLChunk) chunk, null, null, thumbnail, body);
-            }
-            else if (chunk instanceof DLOCChunk) {
-                if (deepLocation != null) {
-                    throw new IIOException("Multiple DLOC chunks not allowed");
-                }
-
-                return new DEEPForm(formType, deepGlobal, (DLOCChunk) chunk, deepPixel, thumbnail, body);
-            }
-            else if (chunk instanceof DPELChunk) {
-                if (deepPixel != null) {
-                    throw new IIOException("Multiple DPEL chunks not allowed");
-                }
-
-                return new DEEPForm(formType, deepGlobal, deepLocation, (DPELChunk) chunk, thumbnail, body);
-            }
-            else if (chunk instanceof XS24Chunk) {
-                if (thumbnail != null) {
-                    throw new IIOException("Multiple XS24 chunks not allowed");
-                }
-
-                return new DEEPForm(formType, deepGlobal, deepLocation, deepPixel, (XS24Chunk) chunk, body);
-            }
-            else if (chunk instanceof BODYChunk) {
-                // TODO: Make a better approach!
-//                 if (body != null) {
-//                     throw new IIOException("Multiple " + toChunkStr(chunk.chunkId) + " chunks not allowed");
-//                 }
-
-                return new DEEPForm(formType, deepGlobal, deepLocation, deepPixel, thumbnail, (BODYChunk) chunk);
-            }
-
-            return (DEEPForm) super.with(chunk);
-        }
-
-        @Override
-        public String toString() {
-            return super.toString() + '{' + deepGlobal + ", " + deepLocation + ", " + deepPixel + '}';
-        }
-    }
-}
@@ -50,25 +50,25 @@ final class GRABChunk extends IFFChunk {

    Point2D point;

-    GRABChunk(int chunkLength) {
-        super(IFF.CHUNK_GRAB, chunkLength);
+    protected GRABChunk(int pChunkLength) {
+        super(IFF.CHUNK_GRAB, pChunkLength);
    }

-    GRABChunk(Point2D point) {
+    protected GRABChunk(Point2D pPoint) {
        super(IFF.CHUNK_GRAB, 4);
-        this.point = point;
+        point = pPoint;
    }

-    void readChunk(DataInput input) throws IOException {
+    void readChunk(DataInput pInput) throws IOException {
        if (chunkLength != 4) {
            throw new IIOException("Unknown GRAB chunk size: " + chunkLength);
        }
-        point = new Point(input.readShort(), input.readShort());
+        point = new Point(pInput.readShort(), pInput.readShort());
    }

-    void writeChunk(DataOutput output) throws IOException {
-        output.writeShort((int) point.getX());
-        output.writeShort((int) point.getY());
+    void writeChunk(DataOutput pOutput) throws IOException {
+        pOutput.writeShort((int) point.getX());
+        pOutput.writeShort((int) point.getY());
    }

    public String toString() {
@@ -35,44 +35,41 @@ import java.io.DataOutput;
 import java.io.IOException;

 /**
- * GenericChunk
+ * UnknownChunk
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: GenericChunk.java,v 1.0 28.feb.2006 00:53:47 haku Exp$
+ * @version $Id: UnknownChunk.java,v 1.0 28.feb.2006 00:53:47 haku Exp$
 */
 final class GenericChunk extends IFFChunk {

    byte[] data;

-    GenericChunk(int chunkId, int chunkLength) {
-        super(chunkId, chunkLength);
-        data = new byte[this.chunkLength];
+    protected GenericChunk(int pChunkId, int pChunkLength) {
+        super(pChunkId, pChunkLength);
+        data = new byte[pChunkLength <= 50 ? pChunkLength : 47];
    }

-    GenericChunk(int chunkId, byte[] chunkData) {
-        super(chunkId, chunkData.length);
-        data = chunkData;
+    protected GenericChunk(int pChunkId, byte[] pChunkData) {
+        super(pChunkId, pChunkData.length);
+        data = pChunkData;
    }

-    @Override
-    void readChunk(final DataInput input) throws IOException {
-        input.readFully(data, 0, data.length);
+    void readChunk(DataInput pInput) throws IOException {
+        pInput.readFully(data, 0, data.length);

-        skipData(input, chunkLength, data.length);
+        skipData(pInput, chunkLength, data.length);
    }

-    @Override
-    void writeChunk(final DataOutput output) throws IOException {
-        output.writeInt(chunkId);
-        output.writeInt(chunkLength);
-        output.write(data, 0, data.length);
+    void writeChunk(DataOutput pOutput) throws IOException {
+        pOutput.writeInt(chunkId);
+        pOutput.writeInt(chunkLength);
+        pOutput.write(data, 0, data.length);

        if (data.length % 2 != 0) {
-            output.writeByte(0); // PAD
+            pOutput.writeByte(0); // PAD
        }
    }

-    @Override
    public String toString() {
        return super.toString() + " {value=\""
                + new String(data, 0, data.length <= 50 ? data.length : 47)
@@ -49,8 +49,6 @@ interface IFF {
    // TODO:
    /** IFF DEEP form type (TVPaint) */
    int TYPE_DEEP  = ('D' << 24) + ('E' << 16) + ('E' << 8) + 'P';
-    /** IFF TVPP form type (TVPaint Project) */
-    int TYPE_TVPP =  ('T' << 24) + ('V' << 16) + ('P' << 8) + 'P';
    /** IFF RGB8 form type (TurboSilver) */
    int TYPE_RGB8  = ('R' << 24) + ('G' << 16) + ('B' << 8) + '8';
    /** IFF RGBN form type (TurboSilver) */
@@ -93,12 +91,6 @@ interface IFF {
    /** EA IFF 85 Generic Copyright text chunk */
    int CHUNK_COPY = ('(' << 24) + ('c' << 16) + (')' << 8) + ' ';

-    /** EA IFF 85 Generic annotation chunk (usually used for Software) */
-    int CHUNK_ANNO = ('A' << 24) + ('N' << 16) + ('N' << 8) + 'O';
-
-    /** Third-party defined UTF-8 text. */
-    int CHUNK_UTF8 = ('U' << 24) + ('T' << 16) + ('F' << 8) + '8';
-
    /** color cycling */
    int CHUNK_CRNG = ('C' << 24) + ('R' << 16) + ('N' << 8) + 'G';
    /** color cycling */
@@ -131,18 +123,6 @@ interface IFF {
    int CHUNK_SHAM = ('S' << 24) + ('H' << 16) + ('A' << 8) + 'M';
    /** ACBM body chunk */
    int CHUNK_ABIT = ('A' << 24) + ('B' << 16) + ('I' << 8) + 'T';
-    /** Unofficial direct color */
+    /** unofficial direct color */
    int CHUNK_DCOL = ('D' << 24) + ('C' << 16) + ('O' << 8) + 'L';
-    /** TVPaint Deep GloBaL information */
-    int CHUNK_DGBL = ('D' << 24) + ('G' << 16) + ('B' << 8) + 'L';
-    /** TVPaint Deep Pixel ELements */
-    int CHUNK_DPEL = ('D' << 24) + ('P' << 16) + ('E' << 8) + 'L';
-    /** TVPaint Deep LOCation information */
-    int CHUNK_DLOC = ('D' << 24) + ('L' << 16) + ('O' << 8) + 'C';
-    /** TVPaint Deep BODy */
-    int CHUNK_DBOD = ('D' << 24) + ('B' << 16) + ('O' << 8) + 'D';
-    /** TVPaint Deep CHanGe buffer */
-    int CHUNK_DCHG = ('D' << 24) + ('C' << 16) + ('H' << 8) + 'G';
-    /** TVPaint 24 bit thumbnail */
-    int CHUNK_XS24 = ('X' << 24) + ('S' << 16) + ('2' << 8) + '4';
 }
@@ -44,25 +44,25 @@ abstract class IFFChunk {
    int chunkId;
    int chunkLength;

-    protected IFFChunk(int chunkId, int chunkLength) {
-        this.chunkId = chunkId;
-        this.chunkLength = chunkLength;
+    protected IFFChunk(int pChunkId, int pChunkLength) {
+        chunkId = pChunkId;
+        chunkLength = pChunkLength;
    }

-    abstract void readChunk(DataInput input) throws IOException;
+    abstract void readChunk(DataInput pInput) throws IOException;

-    abstract void writeChunk(DataOutput output) throws IOException;
+    abstract void writeChunk(DataOutput pOutput) throws IOException;

-    protected static void skipData(final DataInput input, final int chunkLength, final int dataReadSoFar) throws IOException {
+    protected static void skipData(final DataInput pInput, final int chunkLength, final int dataReadSoFar) throws IOException {
        int toSkip = chunkLength - dataReadSoFar;

        while (toSkip > 0) {
-            toSkip -= input.skipBytes(toSkip);
+            toSkip -= pInput.skipBytes(toSkip);
        }

        // Read pad
        if (chunkLength % 2 != 0) {
-            input.readByte();
+            pInput.readByte();
        }
    }

@@ -1,282 +0,0 @@
-package com.twelvemonkeys.imageio.plugins.iff;
-
-import com.twelvemonkeys.imageio.AbstractMetadata;
-
-import javax.imageio.metadata.IIOMetadataNode;
-import java.awt.*;
-import java.awt.image.IndexColorModel;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-import static com.twelvemonkeys.imageio.plugins.iff.IFF.*;
-import static com.twelvemonkeys.lang.Validate.isTrue;
-import static com.twelvemonkeys.lang.Validate.notNull;
-
-final class IFFImageMetadata extends AbstractMetadata {
-    private final Form header;
-    private final IndexColorModel colorMap;
-    private final List<GenericChunk> meta;
-
-    IFFImageMetadata(Form header, IndexColorModel colorMap) {
-        this.header = notNull(header, "header");
-        isTrue(validFormType(header.formType), header.formType, "Unknown IFF Form type: %s");
-        this.colorMap = colorMap;
-        this.meta = header.meta;
-    }
-
-    private boolean validFormType(int formType) {
-        switch (formType) {
-            default:
-                return false;
-            case TYPE_ACBM:
-            case TYPE_DEEP:
-            case TYPE_ILBM:
-            case TYPE_PBM:
-            case TYPE_RGB8:
-            case TYPE_RGBN:
-            case TYPE_TVPP:
-                return true;
-        }
-    }
-
-    @Override
-    protected IIOMetadataNode getStandardChromaNode() {
-        IIOMetadataNode chroma = new IIOMetadataNode("Chroma");
-
-        IIOMetadataNode csType = new IIOMetadataNode("ColorSpaceType");
-        chroma.appendChild(csType);
-
-        switch (header.bitplanes()) {
-            case 8:
-                if (colorMap == null) {
-                    csType.setAttribute("name", "GRAY");
-                    break;
-                }
-            case 1:
-            case 2:
-            case 3:
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-            case 24:
-            case 25:
-            case 32:
-                csType.setAttribute("name", "RGB");
-                break;
-            default:
-                csType.setAttribute("name", "Unknown");
-        }
-
-        // NOTE: Channels in chroma node reflects channels in color model (see data node, for channels in data)
-        IIOMetadataNode numChannels = new IIOMetadataNode("NumChannels");
-        chroma.appendChild(numChannels);
-        if (colorMap == null && header.bitplanes() == 8) {
-            numChannels.setAttribute("value", Integer.toString(1));
-        }
-        else if (header.bitplanes() == 25 || header.bitplanes() == 32) {
-            numChannels.setAttribute("value", Integer.toString(4));
-        }
-        else {
-            numChannels.setAttribute("value", Integer.toString(3));
-        }
-
-        IIOMetadataNode blackIsZero = new IIOMetadataNode("BlackIsZero");
-        chroma.appendChild(blackIsZero);
-        blackIsZero.setAttribute("value", "TRUE");
-
-        // NOTE: TGA files may contain a color map, even if true color...
-        // Not sure if this is a good idea to expose to the meta data,
-        // as it might be unexpected... Then again...
-        if (colorMap != null) {
-            IIOMetadataNode palette = new IIOMetadataNode("Palette");
-            chroma.appendChild(palette);
-
-            for (int i = 0; i < colorMap.getMapSize(); i++) {
-                IIOMetadataNode paletteEntry = new IIOMetadataNode("PaletteEntry");
-                palette.appendChild(paletteEntry);
-                paletteEntry.setAttribute("index", Integer.toString(i));
-
-                paletteEntry.setAttribute("red", Integer.toString(colorMap.getRed(i)));
-                paletteEntry.setAttribute("green", Integer.toString(colorMap.getGreen(i)));
-                paletteEntry.setAttribute("blue", Integer.toString(colorMap.getBlue(i)));
-            }
-
-            if (colorMap.getTransparentPixel() != -1) {
-               IIOMetadataNode backgroundIndex = new IIOMetadataNode("BackgroundIndex");
-               chroma.appendChild(backgroundIndex);
-               backgroundIndex.setAttribute("value", Integer.toString(colorMap.getTransparentPixel()));
-            }
-        }
-
-        // TODO: TVPP TVPaint Project files have a MIXR chunk with a background color
-        //  and also a BGP1 (background pen 1?) and BGP2 chunks
-//        if (extensions != null && extensions.getBackgroundColor() != 0) {
-//            Color background = new Color(extensions.getBackgroundColor(), true);
-//
-//            IIOMetadataNode backgroundColor = new IIOMetadataNode("BackgroundColor");
-//            chroma.appendChild(backgroundColor);
-//
-//            backgroundColor.setAttribute("red", Integer.toString(background.getRed()));
-//            backgroundColor.setAttribute("green", Integer.toString(background.getGreen()));
-//            backgroundColor.setAttribute("blue", Integer.toString(background.getBlue()));
-//        }
-
-        return chroma;
-    }
-
-    @Override
-    protected IIOMetadataNode getStandardCompressionNode() {
-        if (header.compressionType() == BMHDChunk.COMPRESSION_NONE) {
-            return null; // All defaults
-        }
-
-        IIOMetadataNode node = new IIOMetadataNode("Compression");
-
-        IIOMetadataNode compressionTypeName = new IIOMetadataNode("CompressionTypeName");
-        compressionTypeName.setAttribute("value", "RLE");
-        node.appendChild(compressionTypeName);
-
-        IIOMetadataNode lossless = new IIOMetadataNode("Lossless");
-        lossless.setAttribute("value", "TRUE");
-        node.appendChild(lossless);
-
-        return node;
-    }
-
-    @Override
-    protected IIOMetadataNode getStandardDataNode() {
-        IIOMetadataNode data = new IIOMetadataNode("Data");
-
-        // PlanarConfiguration
-        IIOMetadataNode planarConfiguration = new IIOMetadataNode("PlanarConfiguration");
-        switch (header.formType) {
-            case TYPE_DEEP:
-            case TYPE_TVPP:
-            case TYPE_RGB8:
-            case TYPE_PBM:
-                planarConfiguration.setAttribute("value", "PixelInterleaved");
-                break;
-            case TYPE_ILBM:
-                planarConfiguration.setAttribute("value", "PlaneInterleaved");
-                break;
-            default:
-                planarConfiguration.setAttribute("value", "Unknown " + IFFUtil.toChunkStr(header.formType));
-                break;
-        }
-        data.appendChild(planarConfiguration);
-
-        IIOMetadataNode sampleFormat = new IIOMetadataNode("SampleFormat");
-        sampleFormat.setAttribute("value", colorMap != null ? "Index" : "UnsignedIntegral");
-        data.appendChild(sampleFormat);
-
-        // BitsPerSample
-        IIOMetadataNode bitsPerSample = new IIOMetadataNode("BitsPerSample");
-        String value = bitsPerSampleValue(header.bitplanes());
-        bitsPerSample.setAttribute("value", value);
-        data.appendChild(bitsPerSample);
-
-        // SignificantBitsPerSample not in format
-        // SampleMSB not in format
-
-        return data;
-    }
-
-    private String bitsPerSampleValue(int bitplanes) {
-        switch (bitplanes) {
-            case 1:
-            case 2:
-            case 3:
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-                return Integer.toString(bitplanes);
-            case 24:
-                return "8 8 8";
-            case 25:
-                if (header.formType != TYPE_RGB8) {
-                    throw new IllegalArgumentException(String.format("25 bit depth only supported for FORM type RGB8: %s", IFFUtil.toChunkStr(header.formType)));
-                }
-
-                return "8 8 8 1";
-            case 32:
-                return "8 8 8 8";
-            default:
-                throw new IllegalArgumentException("Unknown bit count: " + bitplanes);
-        }
-    }
-
-    @Override
-    protected IIOMetadataNode getStandardDimensionNode() {
-        if (header.aspect() == 0) {
-            return null;
-        }
-
-        IIOMetadataNode dimension = new IIOMetadataNode("Dimension");
-
-        // PixelAspectRatio
-        IIOMetadataNode pixelAspectRatio = new IIOMetadataNode("PixelAspectRatio");
-        pixelAspectRatio.setAttribute("value", String.valueOf(header.aspect()));
-        dimension.appendChild(pixelAspectRatio);
-
-        // TODO: HorizontalScreenSize?
-        // TODO: VerticalScreenSize?
-
-        return dimension;
-    }
-
-    @Override
-    protected IIOMetadataNode getStandardDocumentNode() {
-        IIOMetadataNode document = new IIOMetadataNode("Document");
-
-        IIOMetadataNode formatVersion = new IIOMetadataNode("FormatVersion");
-        document.appendChild(formatVersion);
-        formatVersion.setAttribute("value",  "1.0");
-
-        return document;
-    }
-
-    @Override
-    protected IIOMetadataNode getStandardTextNode() {
-        if (meta.isEmpty()) {
-            return null;
-        }
-
-        IIOMetadataNode text = new IIOMetadataNode("Text");
-
-        // /Text/TextEntry@keyword = field name, /Text/TextEntry@value = field value.
-        for (GenericChunk chunk : meta) {
-            IIOMetadataNode node = new IIOMetadataNode("TextEntry");
-            node.setAttribute("keyword", IFFUtil.toChunkStr(chunk.chunkId));
-            node.setAttribute("value", new String(chunk.data, chunk.chunkId == IFF.CHUNK_UTF8 ? StandardCharsets.UTF_8 : StandardCharsets.US_ASCII));
-            text.appendChild(node);
-        }
-
-        return text;
-    }
-
-    @Override
-    protected IIOMetadataNode getStandardTransparencyNode() {
-        if ((colorMap == null || !colorMap.hasAlpha()) && header.bitplanes() != 32 && header.bitplanes() != 25) {
-            return null;
-        }
-
-        IIOMetadataNode transparency = new IIOMetadataNode("Transparency");
-
-        if (header.bitplanes() == 25 || header.bitplanes() == 32) {
-            IIOMetadataNode alpha = new IIOMetadataNode("Alpha");
-            alpha.setAttribute("value", header.premultiplied() ? "premultiplied" : "nonpremultiplied");
-            transparency.appendChild(alpha);
-        }
-
-        if  (colorMap != null && colorMap.getTransparency() == Transparency.BITMASK) {
-            IIOMetadataNode transparentIndex = new IIOMetadataNode("TransparentIndex");
-            transparentIndex.setAttribute("value", Integer.toString(colorMap.getTransparentPixel()));
-            transparency.appendChild(transparentIndex);
-        }
-
-        return transparency;
-    }
-}
@@ -52,42 +52,39 @@ public final class IFFImageReaderSpi extends ImageReaderSpiBase {
        super(new IFFProviderInfo());
    }

-    @Override
-    public boolean canDecodeInput(final Object source) throws IOException {
-        return source instanceof ImageInputStream && canDecode((ImageInputStream) source);
+    public boolean canDecodeInput(Object pSource) throws IOException {
+        return pSource instanceof ImageInputStream && canDecode((ImageInputStream) pSource);
    }

-    private static boolean canDecode(final ImageInputStream input) throws IOException {
-        input.mark();
+    private static boolean canDecode(ImageInputStream pInput) throws IOException {
+        pInput.mark();

        try {
            // Is it IFF
-            if (input.readInt() == IFF.CHUNK_FORM) {
-                input.readInt();// Skip length field
+            if (pInput.readInt() == IFF.CHUNK_FORM) {
+                pInput.readInt();// Skip length field

-                int type = input.readInt();
-                if (type == IFF.TYPE_ILBM || type == IFF.TYPE_PBM
-                        || type == IFF.TYPE_RGB8 // Impulse RGB8 format
-                        || type == IFF.TYPE_DEEP || type == IFF.TYPE_TVPP) { // TVPaint DEEP format
+                int type = pInput.readInt();
+
+                // Is it ILBM or PBM
+                if (type == IFF.TYPE_ILBM || type == IFF.TYPE_PBM) {
                    return true;
                }

            }
        }
        finally {
-            input.reset();
+            pInput.reset();
        }

        return false;
    }

-    @Override
-    public ImageReader createReaderInstance(final Object extension) {
+    public ImageReader createReaderInstance(Object pExtension) throws IOException {
        return new IFFImageReader(this);
    }

-    @Override
-    public String getDescription(Locale locale) {
+    public String getDescription(Locale pLocale) {
        return "Commodore Amiga/Electronic Arts Image Interchange Format (IFF) image reader";
    }
 }
@@ -57,46 +57,41 @@ import java.io.OutputStream;
 * @see <a href="http://en.wikipedia.org/wiki/Interchange_File_Format">Wikipedia: IFF</a>
 * @see <a href="http://en.wikipedia.org/wiki/ILBM">Wikipedia: IFF ILBM</a>
 */
-public final class IFFImageWriter extends ImageWriterBase {
+public class IFFImageWriter extends ImageWriterBase {

-    IFFImageWriter(ImageWriterSpi provider) {
-        super(provider);
+    public IFFImageWriter() {
+        this(null);
+    }
+
+    protected IFFImageWriter(ImageWriterSpi pProvider) {
+        super(pProvider);
    }

-    @Override
    public IIOMetadata getDefaultImageMetadata(ImageTypeSpecifier imageType, ImageWriteParam param) {
        throw new UnsupportedOperationException("Method getDefaultImageMetadata not implemented");// TODO: Implement
    }

-    @Override
    public IIOMetadata convertImageMetadata(IIOMetadata inData, ImageTypeSpecifier imageType, ImageWriteParam param) {
        throw new UnsupportedOperationException("Method convertImageMetadata not implemented");// TODO: Implement
    }

-    @Override
-    public ImageWriteParam getDefaultWriteParam() {
-        return new IFFWriteParam(getLocale());
-    }
-
-    @Override
-    public void write(IIOMetadata streamMetadata, IIOImage image, ImageWriteParam param) throws IOException {
+    public void write(IIOMetadata pStreamMetadata, IIOImage pImage, ImageWriteParam pParam) throws IOException {
        assertOutput();

-        if (image.hasRaster()) {
+        if (pImage.hasRaster()) {
            throw new UnsupportedOperationException("Cannot write raster");
        }

        processImageStarted(0);

-        RenderedImage renderedImage = image.getRenderedImage();
-        boolean compress = shouldCompress(renderedImage, param);
-
        // Prepare image data to be written
        ByteArrayOutputStream imageData = new FastByteArrayOutputStream(1024);
-        packImageData(imageData, renderedImage, compress);
+        packImageData(imageData, pImage.getRenderedImage(), pParam);
+
+        //System.out.println("Image data: " + imageData.size());

        // Write metadata
-        writeMeta(renderedImage, imageData.size(), compress);
+        writeMeta(pImage.getRenderedImage(), imageData.size());

        // Write image data
        writeBody(imageData);
@@ -104,31 +99,38 @@ public final class IFFImageWriter extends ImageWriterBase {
        processImageComplete();
    }

-    private void writeBody(ByteArrayOutputStream imageData) throws IOException {
+    private void writeBody(ByteArrayOutputStream pImageData) throws IOException {
        imageOutput.writeInt(IFF.CHUNK_BODY);
-        imageOutput.writeInt(imageData.size());
+        imageOutput.writeInt(pImageData.size());

-        // NOTE: This is much faster than imageOutput.write(imageData.toByteArray())
+        // NOTE: This is much faster than imageOutput.write(pImageData.toByteArray())
        // as the data array is not duplicated
-        try (OutputStream adapter = IIOUtil.createStreamAdapter(imageOutput)) {
-            imageData.writeTo(adapter);
+        OutputStream adapter = IIOUtil.createStreamAdapter(imageOutput);
+        try {
+            pImageData.writeTo(adapter);
+        }
+        finally {
+            adapter.close();
        }

-        if (imageData.size() % 2 == 0) {
+        if (pImageData.size() % 2 == 0) {
            imageOutput.writeByte(0); // PAD
        }

        imageOutput.flush();
    }

-    private void packImageData(OutputStream outputStream, RenderedImage image, final boolean compress) throws IOException {
+    private void packImageData(OutputStream pOutput, RenderedImage pImage, ImageWriteParam pParam) throws IOException {
+        // TODO: Allow param to dictate uncompressed
+        // TODO: Allow param to dictate type PBM?
        // TODO: Subsample/AOI
-        final OutputStream output = compress ? new EncoderStream(outputStream, new PackBitsEncoder(), true) : outputStream;
-        final ColorModel model = image.getColorModel();
-        final Raster raster = image.getData();
+        final boolean compress = shouldCompress(pImage);
+        final OutputStream output = compress ? new EncoderStream(pOutput, new PackBitsEncoder(), true) : pOutput;
+        final ColorModel model = pImage.getColorModel();
+        final Raster raster = pImage.getData();

-        final int width = image.getWidth();
-        final int height = image.getHeight();
+        final int width = pImage.getWidth();
+        final int height = pImage.getHeight();

        // Store each row of pixels
        // 0. Loop pr channel
@@ -136,6 +138,7 @@ public final class IFFImageWriter extends ImageWriterBase {
        // 2. Perform byteRun1 compression for each plane separately
        // 3. Write the plane data for each plane

+        //final int planeWidth = (width + 7) / 8;
        final int planeWidth = 2 * ((width + 15) / 16);
        final byte[] planeData = new byte[8 * planeWidth];
        final int channels = (model.getPixelSize() + 7) / 8;
@@ -160,6 +163,10 @@ public final class IFFImageWriter extends ImageWriterBase {

                for (int p = 0; p < planesPerChannel; p++) {
                    output.write(planeData, p * planeWidth, planeWidth);
+
+                    if (!compress && planeWidth % 2 != 0) {
+                        output.write(0); // PAD
+                    }
                }
            }

@@ -171,16 +178,17 @@ public final class IFFImageWriter extends ImageWriterBase {
        output.flush();
    }

-    private void writeMeta(RenderedImage image, int bodyLength, boolean compress) throws IOException {
+    private void writeMeta(RenderedImage pImage, int pBodyLength) throws IOException {
        // Annotation ANNO chunk, 8 + annoData.length bytes
-        String annotation = String.format("Written by %s IFFImageWriter %s", getOriginatingProvider().getVendorName(), getOriginatingProvider().getVersion());
+        String annotation = "Written by " + getOriginatingProvider().getDescription(null) + " by " + getOriginatingProvider().getVendorName();
        GenericChunk anno = new GenericChunk(IFFUtil.toInt("ANNO".getBytes()), annotation.getBytes());

-        ColorModel cm = image.getColorModel();
+        ColorModel cm = pImage.getColorModel();
        IndexColorModel icm = null;

        // Bitmap header BMHD chunk, 8 + 20 bytes
-        int compression = compress ? BMHDChunk.COMPRESSION_BYTE_RUN : BMHDChunk.COMPRESSION_NONE;
+        // By default, don't compress narrow images
+        int compression = shouldCompress(pImage) ? BMHDChunk.COMPRESSION_BYTE_RUN : BMHDChunk.COMPRESSION_NONE;

        BMHDChunk header;
        if (cm instanceof IndexColorModel) {
@@ -188,12 +196,12 @@ public final class IFFImageWriter extends ImageWriterBase {
            icm = (IndexColorModel) cm;
            int trans = icm.getTransparency() == Transparency.BITMASK ? BMHDChunk.MASK_TRANSPARENT_COLOR : BMHDChunk.MASK_NONE;
            int transPixel = icm.getTransparency() == Transparency.BITMASK ? icm.getTransparentPixel() : 0;
-            header = new BMHDChunk(image.getWidth(), image.getHeight(), icm.getPixelSize(),
+            header = new BMHDChunk(pImage.getWidth(), pImage.getHeight(), icm.getPixelSize(),
                                   trans, compression, transPixel);
        }
        else {
            //System.out.println(cm.getClass().getName());
-            header = new BMHDChunk(image.getWidth(), image.getHeight(), cm.getPixelSize(),
+            header = new BMHDChunk(pImage.getWidth(), pImage.getHeight(), cm.getPixelSize(),
                                   BMHDChunk.MASK_NONE, compression, 0);
        }

@@ -205,7 +213,7 @@ public final class IFFImageWriter extends ImageWriterBase {
        }

        // ILBM(4) + anno(8+len) + header(8+20) + cmap(8+len)? + body(8+len);
-        int size = 4 + 8 + anno.chunkLength + 28 + 8 + bodyLength;
+        int size = 4 + 8 + anno.chunkLength + 28 + 8 + pBodyLength;
        if (cmap != null) {
            size += 8 + cmap.chunkLength;
        }
@@ -219,30 +227,21 @@ public final class IFFImageWriter extends ImageWriterBase {
        header.writeChunk(imageOutput);

        if (cmap != null) {
+            //System.out.println("CMAP written");
            cmap.writeChunk(imageOutput);
        }
+
    }

-    private boolean shouldCompress(final RenderedImage image, final ImageWriteParam param) {
-        if (param != null && param.canWriteCompressed()) {
-            switch (param.getCompressionMode()) {
-                case ImageWriteParam.MODE_DISABLED:
-                    return false;
-                case ImageWriteParam.MODE_EXPLICIT:
-                    return IFFWriteParam.COMPRESSION_TYPES[1].equals(param.getCompressionType());
-                default:
-                    // Fall through
-            }
-        }
-
-        return image.getWidth() >= 32;
+    private boolean shouldCompress(RenderedImage pImage) {
+        return pImage.getWidth() >= 32;
    }

-    public static void main(String[] args) throws IOException {
-        BufferedImage image = ImageIO.read(new File(args[0]));
+    public static void main(String[] pArgs) throws IOException {
+        BufferedImage image = ImageIO.read(new File(pArgs[0]));

        ImageWriter writer = new IFFImageWriter(new IFFImageWriterSpi());
-        writer.setOutput(ImageIO.createImageOutputStream(new File(args[1])));
+        writer.setOutput(ImageIO.createImageOutputStream(new File(pArgs[1])));
        //writer.addIIOWriteProgressListener(new ProgressListenerBase() {
        //    int mCurrPct = 0;
        //
@@ -34,6 +34,7 @@ import com.twelvemonkeys.imageio.spi.ImageWriterSpiBase;

 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.ImageWriter;
+import java.io.IOException;
 import java.util.Locale;

 /**
@@ -51,19 +52,17 @@ public class IFFImageWriterSpi extends ImageWriterSpiBase {
        super(new IFFProviderInfo());
    }

-    public boolean canEncodeImage(final ImageTypeSpecifier type) {
+    public boolean canEncodeImage(final ImageTypeSpecifier pType) {
        // TODO: Probably can't store 16 bit types etc...
        // TODO: Can't store CMYK (well.. it does, but they can't be read back) 
        return true;
    }

-    @Override
-    public ImageWriter createWriterInstance(Object extension) {
+    public ImageWriter createWriterInstance(Object pExtension) throws IOException {
        return new IFFImageWriter(this);
    }

-    @Override
-    public String getDescription(Locale locale) {
+    public String getDescription(Locale pLocale) {
        return "Commodore Amiga/Electronic Arts Image Interchange Format (IFF) image writer";
    }
 }
@@ -40,11 +40,11 @@ import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
 * @version $Id: IFFProviderInfo.java,v 1.0 20/03/15 harald.kuhr Exp$
 */
 final class IFFProviderInfo extends ReaderWriterProviderInfo {
-    IFFProviderInfo() {
+    protected IFFProviderInfo() {
        super(
                IFFProviderInfo.class,
                new String[] {"iff", "IFF"},
-                new String[] {"iff", "lbm", "ham", "ham8", "ilbm", "rgb8", "deep"},
+                new String[] {"iff", "lbm", "ham", "ham8", "ilbm"},
                new String[] {"image/iff", "image/x-iff"},
                "com.twelvemonkeys.imageio.plugins.iff.IFFImageReader",
                new String[]{"com.twelvemonkeys.imageio.plugins.iff.IFFImageReaderSpi"},
@@ -47,7 +47,7 @@ package com.twelvemonkeys.imageio.plugins.iff;
 * @author Harald Kuhr (Java port)
 * @version $Id: IFFUtil.java,v 1.0 06.mar.2006 13:31:35 haku Exp$
 */
-final class IFFUtil {
+class IFFUtil {

    /**
     * Creates a rotation table
@@ -56,11 +56,11 @@ final class IFFUtil {
     * @return the rotation table
     */
    static private long[] rtable(int n) {
-        return new long[] {
-                0x00000000L     , 0x00000001L << n, 0x00000100L << n, 0x00000101L << n,
-                0x00010000L << n, 0x00010001L << n, 0x00010100L << n, 0x00010101L << n,
-                0x01000000L << n, 0x01000001L << n, 0x01000100L << n, 0x01000101L << n,
-                0x01010000L << n, 0x01010001L << n, 0x01010100L << n, 0x01010101L << n
+        return new long[]{
+                0x00000000l << n, 0x00000001l << n, 0x00000100l << n, 0x00000101l << n,
+                0x00010000l << n, 0x00010001l << n, 0x00010100l << n, 0x00010101l << n,
+                0x01000000l << n, 0x01000001l << n, 0x01000100l << n, 0x01000101l << n,
+                0x01010000l << n, 0x01010001l << n, 0x01010100l << n, 0x01010101l << n
        };
    }

@@ -75,16 +75,16 @@ final class IFFUtil {
     * Bits from the source are rotated 90 degrees clockwise written to the
     * destination.
     *
-     * @param src     source pixel data
-     * @param srcPos  starting index of 8 x 8 bit source tile
-     * @param srcStep byte offset between adjacent rows in source
-     * @param dst     destination pixel data
-     * @param dstPos  starting index of 8 x 8 bit destination tile
-     * @param dstStep byte offset between adjacent rows in destination
+     * @param pSrc     source pixel data
+     * @param pSrcPos  starting index of 8 x 8 bit source tile
+     * @param pSrcStep byte offset between adjacent rows in source
+     * @param pDst     destination pixel data
+     * @param pDstPos  starting index of 8 x 8 bit destination tile
+     * @param pDstStep byte offset between adjacent rows in destination
     */
-    static void bitRotateCW(final byte[] src, int srcPos, int srcStep,
-                            final byte[] dst, int dstPos, int dstStep) {
-        int idx = srcPos;
+    static void bitRotateCW(final byte[] pSrc, int pSrcPos, int pSrcStep,
+                            final byte[] pDst, int pDstPos, int pDstStep) {
+        int idx = pSrcPos;

        int lonyb;
        int hinyb;
@@ -92,41 +92,41 @@ final class IFFUtil {
        long hi = 0;

        for (int i = 0; i < 8; i++) {
-            lonyb = src[idx] & 0xF;
-            hinyb = (src[idx] >> 4) & 0xF;
+            lonyb = pSrc[idx] & 0xF;
+            hinyb = (pSrc[idx] >> 4) & 0xF;
            lo |= RTABLE[i][lonyb];
            hi |= RTABLE[i][hinyb];
-            idx += srcStep;
+            idx += pSrcStep;
        }

-        idx = dstPos;
+        idx = pDstPos;

-        dst[idx] = (byte)((hi >> 24) & 0xFF);
-        idx += dstStep;
-        if (idx < dst.length) {
-            dst[idx] = (byte)((hi >> 16) & 0xFF);
-            idx += dstStep;
-            if (idx < dst.length) {
-                dst[idx] = (byte)((hi >> 8) & 0xFF);
-                idx += dstStep;
-                if (idx < dst.length) {
-                    dst[idx] = (byte)(hi & 0xFF);
-                    idx += dstStep;
+        pDst[idx] = (byte)((hi >> 24) & 0xFF);
+        idx += pDstStep;
+        if (idx < pDst.length) {
+            pDst[idx] = (byte)((hi >> 16) & 0xFF);
+            idx += pDstStep;
+            if (idx < pDst.length) {
+                pDst[idx] = (byte)((hi >> 8) & 0xFF);
+                idx += pDstStep;
+                if (idx < pDst.length) {
+                    pDst[idx] = (byte)(hi & 0xFF);
+                    idx += pDstStep;
                }
            }
        }

-        if (idx < dst.length) {
-            dst[idx] = (byte)((lo >> 24) & 0xFF);
-            idx += dstStep;
-            if (idx < dst.length) {
-                dst[idx] = (byte)((lo >> 16) & 0xFF);
-                idx += dstStep;
-                if (idx < dst.length) {
-                    dst[idx] = (byte)((lo >> 8) & 0xFF);
-                    idx += dstStep;
-                    if (idx < dst.length) {
-                        dst[idx] = (byte)(lo & 0xFF);
+        if (idx < pDst.length) {
+            pDst[idx] = (byte)((lo >> 24) & 0xFF);
+            idx += pDstStep;
+            if (idx < pDst.length) {
+                pDst[idx] = (byte)((lo >> 16) & 0xFF);
+                idx += pDstStep;
+                if (idx < pDst.length) {
+                    pDst[idx] = (byte)((lo >> 8) & 0xFF);
+                    idx += pDstStep;
+                    if (idx < pDst.length) {
+                        pDst[idx] = (byte)(lo & 0xFF);
                    }
                }
            }
@@ -137,16 +137,16 @@ final class IFFUtil {
     * Rotate bits counterclockwise.
     * The IFFImageWriter uses this to convert pixel bits from chunky to planar.
     *
-     * @param src     source pixel data (only lower 8 bits used)
-     * @param srcPos  starting index of 8 x 8 bit source tile
-     * @param srcStep byte offset between adjacent rows in source
-     * @param dst     destination pixel data
-     * @param dstPos  starting index of 8 x 8 bit destination tile
-     * @param dstStep byte offset between adjacent rows in destination
+     * @param pSrc     source pixel data (only lower 8 bits used)
+     * @param pSrcPos  starting index of 8 x 8 bit source tile
+     * @param pSrcStep byte offset between adjacent rows in source
+     * @param pDst     destination pixel data
+     * @param pDstPos  starting index of 8 x 8 bit destination tile
+     * @param pDstStep byte offset between adjacent rows in destination
     */
-    static void bitRotateCCW(final int[] src, int srcPos, @SuppressWarnings("SameParameterValue") int srcStep,
-                             final byte[] dst, int dstPos, int dstStep) {
-        int idx = srcPos;
+    static void bitRotateCCW(final int[] pSrc, int pSrcPos, int pSrcStep,
+                             final byte[] pDst, int pDstPos, int pDstStep) {
+        int idx = pSrcPos;

        int lonyb;
        int hinyb;
@@ -154,49 +154,48 @@ final class IFFUtil {
        long hi = 0;

        for (int i = 7; i >= 0; i--) {
-            lonyb = src[idx] & 0xF;
-            hinyb = (src[idx] >> 4) & 0xF;
+            lonyb = pSrc[idx] & 0xF;
+            hinyb = (pSrc[idx] >> 4) & 0xF;
            lo |= RTABLE[i][lonyb];
            hi |= RTABLE[i][hinyb];
-            idx += srcStep;
+            idx += pSrcStep;
        }

-        idx = dstPos;
+        idx = pDstPos;

-        dst[idx] = (byte)(lo & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((lo >> 8) & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((lo >> 16) & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((lo >> 24) & 0xFF);
+        pDst[idx] = (byte)(lo & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((lo >> 8) & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((lo >> 16) & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((lo >> 24) & 0xFF);

-        idx += dstStep;
+        idx += pDstStep;

-        dst[idx] = (byte)(hi & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((hi >>  8) & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((hi >> 16) & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((hi >> 24) & 0xFF);
+        pDst[idx] = (byte)(hi & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((hi >>  8) & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((hi >> 16) & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((hi >> 24) & 0xFF);
    }

    /**
     * Rotate bits counterclockwise.
     * The IFFImageWriter uses this to convert pixel bits from chunky to planar.
     *
-     * @param src     source pixel data
-     * @param srcPos  starting index of 8 x 8 bit source tile
-     * @param srcStep byte offset between adjacent rows in source
-     * @param dst     destination pixel data
-     * @param dstPos  starting index of 8 x 8 bit destination tile
-     * @param dstStep byte offset between adjacent rows in destination
+     * @param pSrc     source pixel data
+     * @param pSrcPos  starting index of 8 x 8 bit source tile
+     * @param pSrcStep byte offset between adjacent rows in source
+     * @param pDst     destination pixel data
+     * @param pDstPos  starting index of 8 x 8 bit destination tile
+     * @param pDstStep byte offset between adjacent rows in destination
     */
-    @SuppressWarnings("unused")
-    static void bitRotateCCW(final byte[] src, int srcPos, int srcStep,
-                             final byte[] dst, int dstPos, int dstStep) {
-        int idx = srcPos;
+    static void bitRotateCCW(final byte[] pSrc, int pSrcPos, int pSrcStep,
+                             final byte[] pDst, int pDstPos, int pDstStep) {
+        int idx = pSrcPos;

        int lonyb;
        int hinyb;
@@ -204,57 +203,57 @@ final class IFFUtil {
        long hi = 0;

        for (int i = 7; i >= 0; i--) {
-            lonyb = src[idx] & 0xF;
-            hinyb = (src[idx] >> 4) & 0xF;
+            lonyb = pSrc[idx] & 0xF;
+            hinyb = (pSrc[idx] >> 4) & 0xF;
            lo |= RTABLE[i][lonyb];
            hi |= IFFUtil.RTABLE[i][hinyb];
-            idx += srcStep;
+            idx += pSrcStep;
        }

-        idx = dstPos;
+        idx = pDstPos;

-        dst[idx] = (byte)(lo & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((lo >> 8) & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((lo >> 16) & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((lo >> 24) & 0xFF);
+        pDst[idx] = (byte)(lo & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((lo >> 8) & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((lo >> 16) & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((lo >> 24) & 0xFF);

-        idx += dstStep;
+        idx += pDstStep;

-        dst[idx] = (byte)(hi & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((hi >>  8) & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((hi >> 16) & 0xFF);
-        idx += dstStep;
-        dst[idx] = (byte)((hi >> 24) & 0xFF);
+        pDst[idx] = (byte)(hi & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((hi >>  8) & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((hi >> 16) & 0xFF);
+        idx += pDstStep;
+        pDst[idx] = (byte)((hi >> 24) & 0xFF);
    }

    /**
     * Converts a byte array to an int.
     *
-     * @param bytes a byte array of length 4
+     * @param pBytes a byte array of length 4
     * @return the bytes converted to an int
     *
     * @throws ArrayIndexOutOfBoundsException if length is < 4
     */
-    static int toInt(final byte[] bytes) {
-        return (bytes[0] & 0xff) << 24 | (bytes[1] & 0xff) << 16
-                | (bytes[2] & 0xff) << 8 | (bytes[3] & 0xff);
+    static int toInt(final byte[] pBytes) {
+        return (pBytes[0] & 0xff) << 24 | (pBytes[1] & 0xff) << 16
+                | (pBytes[2] & 0xff) << 8 | (pBytes[3] & 0xff);
    }

    /**
     * Converts an int to a four letter String.
     *
-     * @param chunkId the chunk identifier
+     * @param pChunkId the chunk identifier
     * @return a String
     */
-    static String toChunkStr(int chunkId) {
-        return new String(new byte[] {(byte) ((chunkId & 0xff000000) >> 24),
-                                      (byte) ((chunkId & 0x00ff0000) >> 16),
-                                      (byte) ((chunkId & 0x0000ff00) >>  8),
-                                      (byte) ((chunkId & 0x000000ff))});
+    static String toChunkStr(int pChunkId) {
+        return new String(new byte[] {(byte) ((pChunkId & 0xff000000) >> 24),
+                                      (byte) ((pChunkId & 0x00ff0000) >> 16),
+                                      (byte) ((pChunkId & 0x0000ff00) >>  8),
+                                      (byte) ((pChunkId & 0x000000ff))});
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harald Kuhr	873420286d	[maven-release-plugin] prepare for next development iteration	2021-03-08 14:31:07 +01:00
Harald Kuhr	4993331a5d	[maven-release-plugin] prepare release twelvemonkeys-3.6.4	2021-03-08 14:31:01 +01:00
Harald Kuhr	af0a3889db	#595 Avoid infinite loop on corrupted JPEG stream (cherry picked from commit `ba0bb7b903`)	2021-03-08 14:24:12 +01:00
Harald Kuhr	6acdfd3be6	Readme updates, mentioning JPEG lossless and built-in support (closes #471 ). (cherry picked from commit `d03dc28764`)	2021-03-08 14:24:11 +01:00
Harald Kuhr	cfb664a76a	Updated version numbers. (cherry picked from commit `20a785ea5e`)	2021-03-08 14:23:19 +01:00
Harald Kuhr	86d95e1f02	[maven-release-plugin] prepare for next development iteration	2021-02-26 18:51:06 +01:00
Harald Kuhr	54dd9b6d7b	[maven-release-plugin] prepare release twelvemonkeys-3.6.3	2021-02-26 18:50:59 +01:00
Harald Kuhr	4e10fc019e	#588 Clipping path from JPEG with multiple APP13 segments (cherry picked from commit `970f4f3a7e`)	2021-02-26 18:42:42 +01:00
Harald Kuhr	1295951ead	Fix SGI source subsampling + test optimizations. (cherry picked from commit `6d192968d1`)	2021-02-26 18:42:38 +01:00
Harald Kuhr	d5e664cdcc	JPEG Exif/thumbnail fixes. (cherry picked from commit `fbc738f2d4`)	2021-02-26 18:39:43 +01:00
Harald Kuhr	efe5f3c34a	No longer reads thumbnails, as part of the readWithOrientation method. (cherry picked from commit `80c595cea8`)	2021-02-26 18:33:47 +01:00
Harald Kuhr	2488f6f67c	JPEG Exif/thumbnail fixes. (cherry picked from commit `fbc738f2d4`)	2021-02-26 18:33:46 +01:00
Harald Kuhr	6a66d2e059	More standard key mapping, more correct fit size. Nicer color! (cherry picked from commit `3e3acf3332`)	2021-02-26 18:33:44 +01:00
Koen De Groote	ebd5533879	Upgraded the Apache Batik library from 1.12 to 1.14 due to fixed CVEs. (cherry picked from commit `72cd3aade3`)	2021-02-26 18:32:21 +01:00
Harald Kuhr	e6e4e96309	Update README.md Removed JDK 7 from recommended build. (cherry picked from commit `88bd9cd2ba`)	2021-02-26 18:32:20 +01:00
Harald Kuhr	aadc62dde9	Removed XWD plugin that will be in 3.7. Fixed some incorrect code escaping. (cherry picked from commit `5ee8678a29`)	2021-02-26 18:32:20 +01:00
Harald Kuhr	24cbe57240	Updated README with latest version numbers. (cherry picked from commit `fb1937ae63`)	2021-02-26 18:32:20 +01:00
Harald Kuhr	f7d8ae0cd2	[maven-release-plugin] prepare for next development iteration	2021-01-23 17:09:08 +01:00
Harald Kuhr	5da934e11b	[maven-release-plugin] prepare release twelvemonkeys-3.6.2	2021-01-23 17:08:59 +01:00
Harald Kuhr	51297ad496	#582 : Fix for missing Exif thumbnail, now only issues warning. (cherry picked from commit `de02e3d7e0`)	2021-01-23 17:01:14 +01:00
Harald Kuhr	80a534cd62	Fix some corner cases in BufferedImageInputStream. (cherry picked from commit `8a1a90dafd`)	2021-01-23 17:01:08 +01:00
Harald Kuhr	24130d466d	#579 More reliable CCITT compression type detection (cherry picked from commit `253f04066b`)	2021-01-23 17:01:05 +01:00
Harald Kuhr	7559686782	StandardCharsets.US_ASCII instead of Charset.forName("ascii") (cherry picked from commit `74902b3fb4`)	2021-01-23 17:00:58 +01:00
Harald Kuhr	b6988c37a7	#577 Fix TGA subsampling + bonus metadata fix and palette conversion. (cherry picked from commit `af1a6492d4`)	2021-01-23 17:00:48 +01:00
Harald Kuhr	bbffb1d416	BufferedImageInputStream performance optimizations. (cherry picked from commit `c7d2f422b8`)	2021-01-23 17:00:31 +01:00
Harald Kuhr	c68de3bc92	Updated links to latest version. (cherry picked from commit `25150b421c`)	2021-01-23 16:59:58 +01:00
Harald Kuhr	a12b6044c6	Add XWD to BOM. (cherry picked from commit `94031a2913`)	2021-01-23 16:59:48 +01:00
Harald Kuhr	9a0e2d9659	[maven-release-plugin] prepare for next development iteration	2020-11-19 22:40:02 +01:00
Harald Kuhr	b904f8952f	[maven-release-plugin] prepare release twelvemonkeys-3.6.1	2020-11-19 22:39:53 +01:00
Harald Kuhr	187c952b8e	Setting SNAPSHOT versions.	2020-11-19 22:07:30 +01:00
Harald Kuhr	ca86605923	#574 Better test data. (cherry picked from commit `1d4f681b8f`)	2020-11-19 21:50:40 +01:00
Harald Kuhr	8bc863298f	#574 Fix for possible OOME in Exif metadata. (cherry picked from commit `eda2cd76db`)	2020-11-19 21:50:39 +01:00
Harald Kuhr	3447d1782c	Some minor code clean-up. (cherry picked from commit `4adc60a6c6`)	2020-11-19 21:50:35 +01:00
Harald Kuhr	bf245fde5f	#330 ImageReaderBase.getDestination now throws IIOException for too large dimension/size. (cherry picked from commit `0d5577a9a4`)	2020-11-19 21:50:31 +01:00
Harald Kuhr	c0748dcfd7	#330 Now correctly calculates scanline for 1 & 4 bits (cherry picked from commit `918f92aba7`)	2020-11-19 21:50:26 +01:00
Harald Kuhr	c293516201	#330 Now correctly uses USHORT instead of SHORT for 16 bit DIB. (cherry picked from commit `7a24d55be7`)	2020-11-19 21:50:26 +01:00
Harald Kuhr	f6dae36b7e	#330 Now guards against buffer overruns in RLE decoder. (cherry picked from commit `a84cc1c060`)	2020-11-19 21:50:26 +01:00
Harald Kuhr	a14b481e9e	#330 Minor improvements to avoid RuntimeExceptions. (cherry picked from commit `31cb79d2b9`)	2020-11-19 21:50:22 +01:00
Harald Kuhr	d9c1a39c37	Fixed Maven Central link URL to more relevant URL. (cherry picked from commit `d995e7baa0`)	2020-11-19 21:50:17 +01:00
Harald Kuhr	e9d9f99bb0	Fixed Maven Central link URL (cherry picked from commit `e7fe6d5c22`)	2020-11-19 21:50:13 +01:00
Harald Kuhr	b9749b94b0	Release notes already on the Github page. (cherry picked from commit `918b698e50`)	2020-11-19 21:50:13 +01:00
Harald Kuhr	4996dff6e4	...and again. (cherry picked from commit `2427b2323f`)	2020-11-19 21:50:13 +01:00
Harald Kuhr	b1a2244c7f	...and again. (cherry picked from commit `0a8222fea3`)	2020-11-19 21:50:08 +01:00
Harald Kuhr	c6fe747ca3	Fixed metadata support (not all formats have it yet). (cherry picked from commit `60a00b89ae`)	2020-11-19 21:50:04 +01:00
Harald Kuhr	e1af4d7da9	Removed empty lines. Added missing BMP info. (cherry picked from commit `4c88efa19d`)	2020-11-19 21:50:03 +01:00
Harald Kuhr	33556cc0ec	New & improved README with tables and link to Wiki! (cherry picked from commit `17d65a1f6f`)	2020-11-19 21:50:03 +01:00
Harald Kuhr	eaf13b102f	Added PayPal donation link. Go use it! :-) (cherry picked from commit `fcd03eb903`)	2020-11-19 21:49:59 +01:00
Harald Kuhr	74718f1ffb	Now correctly uses ImageInputStream instead of ImageOutputStream... (cherry picked from commit `4e69efce28`)	2020-11-19 21:49:55 +01:00
Harald Kuhr	bd3700ea59	...and fix the broken test. (cherry picked from commit `16caec4a22`)	2020-11-19 21:49:50 +01:00
Harald Kuhr	8fccd9445f	Minor improvements and better test cases. (cherry picked from commit `08282ea09d`)	2020-11-19 21:49:49 +01:00
Harald Kuhr	cf0ed8f95c	Update README.md (cherry picked from commit `a16fce0749`)	2020-11-19 21:49:49 +01:00
Harald Kuhr	c12e4e5646	Fixed URL now works, ideally should point to correct branch... (cherry picked from commit `26e2fa0168`)	2020-11-19 21:49:03 +01:00
Harald Kuhr	287b73c732	More standard way for getting vendor name and version info. (cherry picked from commit `120deb3ad4`)	2020-11-19 21:49:01 +01:00
Harald Kuhr	24271b8cad	NetBPM clean-up, fixes and better tests. (cherry picked from commit `0a9e2df5de`)	2020-11-19 21:48:59 +01:00
Harald Kuhr	3e2f54ee7c	Verify that RGB data is correct. (cherry picked from commit `6ffcb88872`)	2020-11-19 21:48:59 +01:00
Harald Kuhr	2511b2d0cd	Added test to verify how to write CMYK JPEG without ICC profile. (cherry picked from commit `960e764c7b`)	2020-11-19 21:48:58 +01:00
Harald Kuhr	a15d54c92c	Code clean-up. (cherry picked from commit `d88f27b251`)	2020-11-19 21:48:56 +01:00
Harald Kuhr	47b7c4b16c	Added missing tests. (cherry picked from commit `e5b3e9755e`)	2020-11-19 21:48:55 +01:00
Harald Kuhr	9e1b01a7fd	ImageWriterAbstractTest refactorings. (cherry picked from commit `6c34fb211f`)	2020-11-19 21:48:55 +01:00
Harald Kuhr	769acc8726	ImageReaderAbstractTest refactorings. (cherry picked from commit `9fdbc3b1fc`)	2020-11-19 21:48:15 +01:00
Harald Kuhr	1ace3a6d5f	Getting rid of more JUnit deprecation. (cherry picked from commit `622c6f40d4`)	2020-11-19 21:44:36 +01:00
Harald Kuhr	a06eb53cd2	Dependabot broke my build... (cherry picked from commit `107da17ca9`)	2020-11-19 21:44:36 +01:00
dependabot[bot]	1e1a640a6c	Bump junit from 4.7 to 4.13.1 in /sandbox Bumps [junit](https://github.com/junit-team/junit4) from 4.7 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.7...r4.13.1) Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit `19c62ac7da`)	2020-11-19 21:44:35 +01:00
dependabot[bot]	2444bc5ad4	Bump junit from 4.7 to 4.13.1 in /common Bumps [junit](https://github.com/junit-team/junit4) from 4.7 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.7...r4.13.1) Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit `a4d20a4af4`)	2020-11-19 21:42:48 +01:00
dependabot[bot]	2e656a45f9	Bump junit from 4.7 to 4.13.1 in /imageio Bumps [junit](https://github.com/junit-team/junit4) from 4.7 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.7...r4.13.1) Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit `0643d5910a`)	2020-11-19 21:42:32 +01:00
dependabot[bot]	657928f4a5	Bump junit from 4.7 to 4.13.1 in /contrib Bumps [junit](https://github.com/junit-team/junit4) from 4.7 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.7...r4.13.1) Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit `c78a456985`)	2020-11-19 21:42:32 +01:00
dependabot[bot]	08f7e070dc	Bump junit from 4.7 to 4.13.1 in /servlet Bumps [junit](https://github.com/junit-team/junit4) from 4.7 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.7...r4.13.1) Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit `27017576d3`)	2020-11-19 21:42:32 +01:00
Harald Kuhr	b205226f0c	Better output when debugging readers. (cherry picked from commit `021aba1a98`)	2020-11-19 21:42:32 +01:00
Harald Kuhr	821df11d90	Removed work in progress... (cherry picked from commit `a0b68adff3`)	2020-11-19 21:42:31 +01:00
Harald Kuhr	a62a838a0d	Fixed a minor dependency issue. All test-jar dependencies now has correct test scope. (cherry picked from commit `fa4586663c`)	2020-11-19 21:42:31 +01:00
Harald Kuhr	75ff0f265f	Better PFM support. (cherry picked from commit `623d13a517`)	2020-11-19 21:42:31 +01:00
Harald Kuhr	15c7cfe9a6	Code clean-up. (cherry picked from commit `a7ebc1b52f`)	2020-11-19 21:39:58 +01:00
Harald Kuhr	1286077b02	Added PNMImageWriterTest (cherry picked from commit `f54f4370c0`)	2020-11-19 21:39:56 +01:00
Harald Kuhr	5757743db7	Add missing tests. (cherry picked from commit `5040e9fe8a`)	2020-11-19 21:39:55 +01:00
Harald Kuhr	fbaa13d48d	Minor language fix. (cherry picked from commit `fc72cd34a1`)	2020-11-19 21:39:53 +01:00
Harald Kuhr	f12df442e9	Added section about re-packaging and Shade plugin. (cherry picked from commit `6d71a3d306`)	2020-11-19 21:39:51 +01:00
Harald Kuhr	0c0712ab30	Comment fix (cherry picked from commit `86f8cf52a5`)	2020-11-19 21:39:50 +01:00
Harald Kuhr	9267842788	#556 PICTImageReaderSpi no longer claim to decode known formats (cherry picked from commit `bda6544a5f`)	2020-11-19 21:39:48 +01:00
Harald Kuhr	bcffeb04ec	#466 TGA extension size fix for 3ds max files (cherry picked from commit `49c7cd1979`)	2020-11-19 21:39:47 +01:00
Harald Kuhr	d1a1bab18c	Code clean-up. (cherry picked from commit `9dae58d5a6`)	2020-11-19 21:39:47 +01:00
Harald Kuhr	6b5e75a22b	Update readme to 3.6. (cherry picked from commit `ed14b97199`)	2020-11-19 21:39:47 +01:00