Added missing CRW pom

Added CRW read
Updated to latest.
2026-05-22 00:00:03 -04:00 · 2021-05-13 15:13:55 +02:00 · 2021-05-13 15:09:59 +02:00 · 2021-05-13 15:08:51 +02:00 · 2021-05-13 14:58:40 +02:00 · 2018-08-21 17:50:57 +02:00
616 changed files with 53583 additions and 19312 deletions
@@ -7,14 +7,14 @@ assignees: ''
 ---
-**Is your feature request related to a use case or a problem you are working on? Please describe.**
+**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem or use case is. Understanding the rationale is key, to be able to implemeent the right solution. 
+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 already considered, and why they won't work.
+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,10 +1,16 @@
-**What is fixed** Add link to the issue this PR fixes. 
+**What is fixed**
-Example: Fixes #42. 
+Add link to the issue this PR fixes. 
-**Why is this change proposed** If this change does *not* fix an open issue, briefly describe the rationale for this PR.
+Fixes #42. 
-**What is changed** Briefly describe the changes proposed in this pull request: 
+**Why is this change proposed**
 If this change does *not* fix an open issue, briefly describe the rationale for this PR.
 **What is changed**
 Briefly describe the changes proposed in this pull request: 
 * Fixed rare exception happening in `x >= 42` case
 * Small optimization of `decompress()` method
@@ -1,13 +0,0 @@
 version: 2
 updates:
  # Maven/Java library updates
  - package-ecosystem: "maven"
    directory: "/"
    schedule:
      interval: "daily"
    open-pull-requests-limit: 10
  # GitHub actions updates
  - package-ecosystem: "github-actions"
    directory: "/.github/workflows"
    schedule:
      interval: "daily"
@@ -1,102 +0,0 @@
 name: CI
 on:
  push:
    branches:
      - '**'
      - '!dependabot/**'
  pull_request:
    branches: [ 'master' ]
 permissions: read-all
 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, 21 ]
    runs-on: ${{ matrix.os }}
    permissions:
      checks: write
    steps:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
        with:
          distribution: 'temurin'
          java-version: ${{ matrix.java }}
          java-package: jdk
          cache: 'maven'
      - name: Run Tests
        run: mvn --batch-mode --no-transfer-progress test
      - name: Publish Test Report
        uses: mikepenz/action-junit-report@0831a82caad2465c31c6dd929978f640cb42556c # v4.0.3
        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
    permissions:
      checks: write
    strategy:
      matrix:
        kcms: [ true, false ]
    steps:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
      - 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@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
        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 --batch-mode --no-transfer-progress test
      - name: Publish Test Report
        uses: mikepenz/action-junit-report@0831a82caad2465c31c6dd929978f640cb42556c # v4.0.3
        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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
      - name: Set up Maven Central
        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
        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 --batch-mode help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
      - name: Publish to Maven Central
        if: ${{ endsWith(env.PROJECT_VERSION, '-SNAPSHOT') }}
        run: mvn --batch-mode --no-transfer-progress 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)
@@ -1,69 +0,0 @@
 name: "CodeQL"
 on:
  push:
    branches: [ "master" ]
  pull_request:
    # The branches below must be a subset of the branches above
    branches: [ "master" ]
  schedule:
    - cron: '26 13 * * 6'
 permissions: {}
 jobs:
  analyze:
    name: Analyze
    # Runner size impacts CodeQL analysis time. To learn more, please see:
    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
    #   - https://gh.io/supported-runners-and-hardware-resources
    #   - https://gh.io/using-larger-runners
    # Consider using larger runners for possible analysis time improvements.
    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
    permissions:
      actions: read
      contents: read
      security-events: write
    strategy:
      fail-fast: false
      matrix:
        language: [ 'java' ]
    steps:
    - name: Checkout repository
      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
      uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
        # By default, queries listed here will override any specified in a config file.
        # Prefix the list here with "+" to use these queries and those in the config file.
        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
        # queries: security-extended,security-and-quality
    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
      uses: github/codeql-action/autobuild@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
    #   If the Autobuild fails above, remove it and uncomment the following three lines.
    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
    # - run: |
    #     echo "Run, Build Application using script"
    #     ./location_of_script_within_repo/buildscript.sh
    - name: Perform CodeQL Analysis
      uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
      with:
        category: "/language:${{matrix.language}}"
@@ -1,62 +0,0 @@
 # This workflow uses actions that are not certified by GitHub. They are provided
 # by a third-party and are governed by separate terms of service, privacy
 # policy, and support documentation.
 name: Scorecard supply-chain security
 on:
  # For Branch-Protection check. Only the default branch is supported. See
  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
  branch_protection_rule:
  # To guarantee Maintained check is occasionally updated. See
  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
  schedule:
    - cron: '38 8 * * 2'
  push:
    branches: [ "master" ]
 permissions: read-all # Declare default permissions as read only.
 jobs:
  analysis:
    name: Scorecard analysis
    runs-on: ubuntu-latest
    permissions:
      security-events: write  # to upload the results to code-scanning dashboard.
      id-token: write # to publish results and get a badge
    steps:
      - name: "Checkout code"
        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          persist-credentials: false
      - name: "Run analysis"
        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
        with:
          results_file: results.sarif
          results_format: sarif
          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
          # you want to enable the Branch-Protection check on the repository
          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-fine-grained-pat-optional.
          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
          # Publish Results:
          #   - Publish results to OpenSSF REST API for easy access by consumers
          #   - Allows the repository to include the Scorecard badge.
          #   - See https://github.com/ossf/scorecard-action#publishing-results.
          publish_results: true
      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
      # format to the repository Actions tab.
      - name: "Upload artifact"
        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: SARIF file
          path: results.sarif
          retention-days: 5
      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
        uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
        with:
          sarif_file: results.sarif
@@ -15,4 +15,3 @@ private
 profiles.xml
 Thumbs.db
 .DS_Store
 /.metadata/
@@ -0,0 +1,14 @@
 dist: trusty
 language: java
 jdk:
  - oraclejdk8  # Legacy
  - oraclejdk11 # LTS
  - oraclejdk15 # Latest
 jobs:
  include:
    # Extra job, testing legacy CMM option
    - jdk: oraclejdk8
      env: MAVEN_OPTS=-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider
 cache:
  directories:
  - $HOME/.m2
@@ -1,62 +1,58 @@
-[![CI](https://github.com/haraldk/TwelveMonkeys/actions/workflows/ci.yml/badge.svg)](https://github.com/haraldk/TwelveMonkeys/actions/workflows/ci.yml)
+[![Build Status](https://travis-ci.org/haraldk/TwelveMonkeys.svg?branch=master)](https://travis-ci.org/haraldk/TwelveMonkeys) 
-[![CodeQL](https://github.com/haraldk/TwelveMonkeys/actions/workflows/codeql.yml/badge.svg)](https://github.com/haraldk/TwelveMonkeys/actions/workflows/codeql.yml)
+[![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)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/haraldk/TwelveMonkeys/badge)](https://securityscorecards.dev/viewer/?uri=github.com/haraldk/TwelveMonkeys)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/7900/badge)](https://www.bestpractices.dev/projects/7900)
 [![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/)
 [![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)
 ![Logo](logo.png)
 ## 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. 
+These plugins extend the number of image file formats supported in Java, using the `javax.imageio.*` package.
-Support for these formats is important, to be able to read data found
+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 |
+| Plugin | Format   | Description           | Read | Write | Metadata | Notes |
-| ------ | -------- |---------------------------------------------------------|:---:|:---:| -------- | ----- |
+| ------ | -------- | -----------           |:----:|:-----:| -------- | ----- |
-| Batik  | **SVG**  | Scalable Vector Graphics                                | ✔ |  -  | - | Requires [Batik](https://xmlgraphics.apache.org/batik/) |
+| Batik  | **SVG**  | Scalable Vector Graphics | ✔ |  -  | - | Requires [Batik](https://xmlgraphics.apache.org/batik/)
-|        | WMF      | MS Windows Metafile                                     | ✔ |  -  | - | 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) |
+| [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                                | ✔  |  -  | - |
+|        | CUR      | MS Windows Cursor Format  | ✔  | -   | - |
-|        | ICO      | MS Windows Icon 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) | 
+| [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                                        | ✔  |  ✔  | -  | 
+| [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) | 
+| [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](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) | 
+|   | 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) | 
+| [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) | 
+|        | 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) | 
+| [PICT](https://github.com/haraldk/TwelveMonkeys/wiki/PICT-Plugin)   | PICT     | Apple QuickTime Picture Format | ✔  | ✔   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-|        | PNTG     | Apple MacPaint Picture Format                           | ✔  |  -  | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
+|        | PNTG     | Apple MacPaint Picture Format | ✔  |     | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-| [PNM](https://github.com/haraldk/TwelveMonkeys/wiki/PNM-Plugin)    | PAM      | NetPBM Portable Any Map                                 | ✔  |  ✔  | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
+| [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) | 
+|        | 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) | 
+|        | 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) | 
+|        | 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) | 
+|        | PFM      | Portable Float Map | ✔  | -   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
-| [PSD](https://github.com/haraldk/TwelveMonkeys/wiki/PSD-Plugin)    | **PSD**  | Adobe Photoshop Document                                | ✔  | (✔) | Native, [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |  
+| [PSD](https://github.com/haraldk/TwelveMonkeys/wiki/PSD-Plugin)    | **PSD**  | Adobe Photoshop Document | ✔  | - | Native & [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) |  
-|        |  PSB     | Adobe Photoshop Large Document                          | ✔  |  -  | Native, [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
+|        |  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) | 
+| [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) | 
+| [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 |
+|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) | 
+| [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) |  
+|        | 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) |  
+| [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) | 
+| XWD    | XWD      | X11 Window Dump Format | ✔  | -   | [Standard](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/metadata/doc-files/standard_metadata.html) | 
 **Important note on using Batik:** *Please read [The Apache™ XML Graphics Project - Security](https://xmlgraphics.apache.org/security.html), 
-and make sure you use an updated and secure version.*
+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
 [JDK standard plugins](https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/javax/imageio/package-summary.html).
@@ -278,12 +274,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.10.1</version>
+        <version>3.7.0</version>
    </dependency>
    <dependency>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio-tiff</artifactId>
-        <version>3.10.1</version>
+        <version>3.7.0</version>
    </dependency>
    <!--
@@ -293,17 +289,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.10.1</version>
+        <version>3.7.0</version>
    </dependency>
    <!--
    Or Jakarta version, for Servlet API 5.0
    -->
    <dependency>
        <groupId>com.twelvemonkeys.servlet</groupId>
        <artifactId>servlet</artifactId>
        <version>3.10.1</version>
        <classifier>jakarta</classifier>
    </dependency>
 </dependencies>
 ```
@@ -312,13 +298,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.10.1.jar
+    twelvemonkeys-common-lang-3.7.0.jar
-    twelvemonkeys-common-io-3.10.1.jar
+    twelvemonkeys-common-io-3.7.0.jar
-    twelvemonkeys-common-image-3.10.1.jar
+    twelvemonkeys-common-image-3.7.0.jar
-    twelvemonkeys-imageio-core-3.10.1.jar
+    twelvemonkeys-imageio-core-3.7.0.jar
-    twelvemonkeys-imageio-metadata-3.10.1.jar
+    twelvemonkeys-imageio-metadata-3.7.0.jar
-    twelvemonkeys-imageio-jpeg-3.10.1.jar
+    twelvemonkeys-imageio-jpeg-3.7.0.jar
-    twelvemonkeys-imageio-tiff-3.10.1.jar
+    twelvemonkeys-imageio-tiff-3.7.0.jar
 #### Deploying the plugins in a web app
@@ -384,50 +370,81 @@ Other "fat" JAR bundlers will probably have similar mechanisms to merge entries
 ### Links to prebuilt binaries
-##### Latest version (3.10.1)
+##### Latest version (3.7.0)
-The latest version that will run on Java 7 is 3.9.4. Later versions will require Java 8 or later.
+Requires Java 7 or later.
 Common dependencies
-* [common-lang-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.10.1/common-lang-3.10.1.jar)
+* [common-lang-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.7.0/common-lang-3.7.0.jar)
-* [common-io-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.10.1/common-io-3.10.1.jar)
+* [common-io-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.7.0/common-io-3.7.0.jar)
-* [common-image-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.10.1/common-image-3.10.1.jar)
+* [common-image-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.7.0/common-image-3.7.0.jar)
 ImageIO dependencies
-* [imageio-core-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.10.1/imageio-core-3.10.1.jar)
+* [imageio-core-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.7.0/imageio-core-3.7.0.jar)
-* [imageio-metadata-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.10.1/imageio-metadata-3.10.1.jar)
+* [imageio-metadata-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.7.0/imageio-metadata-3.7.0.jar)
 ImageIO plugins
-* [imageio-bmp-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.10.1/imageio-bmp-3.10.1.jar)
+* [imageio-bmp-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.7.0/imageio-bmp-3.7.0.jar)
-* [imageio-hdr-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.10.1/imageio-hdr-3.10.1.jar)
+* [imageio-hdr-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.7.0/imageio-hdr-3.7.0.jar)
-* [imageio-icns-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.10.1/imageio-icns-3.10.1.jar)
+* [imageio-icns-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.7.0/imageio-icns-3.7.0.jar)
-* [imageio-iff-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.10.1/imageio-iff-3.10.1.jar)
+* [imageio-iff-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.7.0/imageio-iff-3.7.0.jar)
-* [imageio-jpeg-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.10.1/imageio-jpeg-3.10.1.jar)
+* [imageio-jpeg-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.7.0/imageio-jpeg-3.7.0.jar)
-* [imageio-pcx-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.10.1/imageio-pcx-3.10.1.jar)
+* [imageio-pcx-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.7.0/imageio-pcx-3.7.0.jar)
-* [imageio-pict-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.10.1/imageio-pict-3.10.1.jar)
+* [imageio-pict-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.7.0/imageio-pict-3.7.0.jar)
-* [imageio-pnm-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.10.1/imageio-pnm-3.10.1.jar)
+* [imageio-pnm-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.7.0/imageio-pnm-3.7.0.jar)
-* [imageio-psd-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.10.1/imageio-psd-3.10.1.jar)
+* [imageio-psd-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.7.0/imageio-psd-3.7.0.jar)
-* [imageio-sgi-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.10.1/imageio-sgi-3.10.1.jar)
+* [imageio-sgi-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.7.0/imageio-sgi-3.7.0.jar)
-* [imageio-tga-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.10.1/imageio-tga-3.10.1.jar)
+* [imageio-tga-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.7.0/imageio-tga-3.7.0.jar)
-* [imageio-thumbsdb-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.10.1/imageio-thumbsdb-3.10.1.jar)
+* [imageio-thumbsdb-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.7.0/imageio-thumbsdb-3.7.0.jar)
-* [imageio-tiff-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.10.1/imageio-tiff-3.10.1.jar)
+* [imageio-tiff-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.7.0/imageio-tiff-3.7.0.jar)
-* [imageio-webp-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-webp/3.10.1/imageio-webp-3.10.1.jar)
+* [imageio-webp-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-webp/3.7.0/imageio-webp-3.7.0.jar)
-* [imageio-xwd-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-xwd/3.10.1/imageio-xwd-3.10.1.jar)
+* [imageio-xwd-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-xwd/3.7.0/imageio-xwd-3.7.0.jar)
 ImageIO plugins requiring 3rd party libs
-* [imageio-batik-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.10.1/imageio-batik-3.10.1.jar)
+* [imageio-batik-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.7.0/imageio-batik-3.7.0.jar)
 Photoshop Path support for ImageIO
-* [imageio-clippath-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.10.1/imageio-clippath-3.10.1.jar)
+* [imageio-clippath-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.7.0/imageio-clippath-3.7.0.jar)
 Servlet support
-* [servlet-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.10.1/servlet-3.10.1.jar)
+* [servlet-3.7.0.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.7.0/servlet-3.7.0.jar)
 ##### Old version (3.0.x)
 Use this version for projects that requires Java 6 or need the JMagick support. *Does not support Java 8 or later*.
 Common dependencies
 * [common-lang-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.0.2/common-lang-3.0.2.jar)
 * [common-io-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.0.2/common-io-3.0.2.jar)
 * [common-image-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.0.2/common-image-3.0.2.jar)
 ImageIO dependencies
 * [imageio-core-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.0.2/imageio-core-3.0.2.jar)
 * [imageio-metadata-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.0.2/imageio-metadata-3.0.2.jar)
 ImageIO plugins
 * [imageio-jpeg-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.0.2/imageio-jpeg-3.0.2.jar)
 * [imageio-tiff-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.0.2/imageio-tiff-3.0.2.jar)
 * [imageio-psd-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.0.2/imageio-psd-3.0.2.jar)
 * [imageio-pict-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.0.2/imageio-pict-3.0.2.jar)
 * [imageio-iff-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.0.2/imageio-iff-3.0.2.jar)
 * [imageio-icns-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.0.2/imageio-icns-3.0.2.jar)
 * [imageio-ico-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-ico/3.0.2/imageio-ico-3.0.2.jar)
 * [imageio-thumbsdb-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.0.2/imageio-thumbsdb-3.0.2.jar)
 ImageIO plugins requiring 3rd party libs
 * [imageio-batik-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.0.2/imageio-batik-3.0.2.jar)
 * [imageio-jmagick-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jmagick/3.0.2/imageio-jmagick-3.0.2.jar)
 Servlet support
 * [servlet-3.0.2.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.0.2/servlet-3.0.2.jar)
 ## License
 This project is provided under the OSI approved [BSD license](https://opensource.org/licenses/BSD-3-Clause):
-    Copyright (c) 2008-2022, Harald Kuhr
+    Copyright (c) 2008-2020, Harald Kuhr
    All rights reserved.
    Redistribution and use in source and binary forms, with or without
@@ -459,9 +476,8 @@ This project is provided under the OSI approved [BSD license](https://opensource
 q: How do I use it?
-a: The easiest way is to build your own project using Maven, Gradle or other build tool with dependency management, 
+a: The easiest way is to build your own project using Maven, and just add dependencies to the specific plug-ins you need.
-and just add dependencies to the specific plug-ins you need.
+ If you don't use Maven, make sure you have all the necessary JARs in classpath. See the Install section above.
 If you don't use such a build tool, make sure you have all the necessary JARs in classpath. See the Install section above.
 q: What changes do I have to make to my code in order to use the plug-ins?
@@ -479,41 +495,27 @@ q: How does it work?
 a: The TwelveMonkeys ImageIO project contains plug-ins for ImageIO. ImageIO uses a service lookup mechanism, to discover plug-ins at runtime. 
-All you have to do, is to make sure you have the TwelveMonkeys ImageIO JARs in your classpath.
+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).
 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
-the Sun/Oracle provided `JPEGImageReader`, `BMPImageReader` `TIFFImageReader`, and the Apple provided `TIFFImageReader` on OS X, 
+the Sun/Oracle provided `JPEGImageReader` and `BMPImageReader`, and the Apple provided `TIFFImageReader` on OS X, 
 respectively. Using the pairwise ordering will not remove any functionality form these implementations, but in most 
 cases you'll end up using the TwelveMonkeys plug-ins instead.
 q: Why is there no support for common formats like GIF or PNG?
-a: The short answer is simply that the built-in support in ImageIO for these formats are considered good enough as-is.
+a: The short answer is simply that the built-in support in ImageIO for these formats are good enough as-is.
 If you are looking for better PNG write performance on Java 7 and 8, see [JDK9 PNG Writer Backport](https://github.com/gredler/jdk9-png-writer-backport).
 q: When is the next release? What is the current release schedule?
 a: The goal is to make monthly releases, containing bug fixes and minor new features. 
 And quarterly releases with more "major" features.
 q: I love this project! How can I help?
 a: Have a look at the open issues, and see if there are any issues you can help fix, or provide sample file or create test cases for.
 It is also possible for you or your organization to become a sponsor, through GitHub Sponsors. 
 Providing funding will allow us to spend more time on fixing bugs and implementing new features. 
 q: What about JAI? Several of the formats are already supported by JAI.
 a: While JAI (and jai-imageio in particular) have support for some of the same formats, JAI has some major issues.
 The most obvious being:
- It's not actively developed. No issue has been fixed for years.
+- It's not actively developed. No issues has been fixed for years.
 - To get full format support, you need native libs.
 Native libs does not exist for several popular platforms/architectures, and further the native libs are not open source.
 Some environments may also prevent deployment of native libs, which brings us back to square one.
@@ -1,5 +0,0 @@
 # Security Policy
 To report a security issue, please disclose it at [security advisory](https://github.com/haraldk/TwelveMonkeys/security/advisories/new).
 Vulnerabilities will be disclosed in a best effort base.
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <groupId>com.twelvemonkeys.bom</groupId>
@@ -58,6 +58,16 @@
                <artifactId>imageio-bmp</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-cr2</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-dng</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-hdr</artifactId>
@@ -78,6 +88,11 @@
                <artifactId>imageio-jpeg</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-nef</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-pcx</artifactId>
@@ -123,11 +138,6 @@
                <artifactId>imageio-tiff</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-webp</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-xwd</artifactId>
@@ -4,13 +4,13 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>common-image</artifactId>
    <packaging>jar</packaging>
    <name>TwelveMonkeys :: Common :: Image</name>
    <description>
-        TwelveMonkeys Common image support classes.
+        The TwelveMonkeys Common Image support
    </description>
    <properties>
@@ -31,18 +31,9 @@
        <dependency>
            <groupId>jmagick</groupId>
            <artifactId>jmagick</artifactId>
-            <version>6.6.9</version>
+            <version>6.2.4</version>
            <optional>true</optional>
            <scope>provided</scope>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
 </project>
@@ -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.*;
 import java.awt.image.BufferedImageOp;
 import java.awt.image.ColorModel;
 import java.awt.image.ImagingOpException;
 import java.awt.image.Raster;
 import java.awt.image.RasterOp;
 import java.awt.image.WritableRaster;
 /**
 * This is a drop-in replacement for {@link java.awt.image.AffineTransformOp}.
@@ -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();
                }
            }
        }
    }
@@ -79,7 +79,7 @@ public final class BufferedImageFactory {
    private int scanSize;
    private ColorModel sourceColorModel;
-    private Hashtable<?, ?> sourceProperties; // ImageConsumer API dictates Hashtable
+    private Hashtable sourceProperties; // ImageConsumer API dictates Hashtable
    private Object sourcePixels;
@@ -91,21 +91,21 @@ public final class BufferedImageFactory {
    /**
     * Creates a {@code BufferedImageFactory}.
-     * @param source the source image
+     * @param pSource the source image
-     * @throws IllegalArgumentException if {@code source == null}
+     * @throws IllegalArgumentException if {@code pSource == null}
     */
-    public BufferedImageFactory(final Image source) {
+    public BufferedImageFactory(final Image pSource) {
-        this(source != null ? source.getSource() : null);
+        this(pSource != null ? pSource.getSource() : null);
    }
    /**
     * Creates a {@code BufferedImageFactory}.
-     * @param source the source image producer
+     * @param pSource the source image producer
-     * @throws IllegalArgumentException if {@code source == null}
+     * @throws IllegalArgumentException if {@code pSource == null}
     */
-    public BufferedImageFactory(final ImageProducer source) {
+    public BufferedImageFactory(final ImageProducer pSource) {
-        Validate.notNull(source, "source");
+        Validate.notNull(pSource, "source");
-        producer = source;
+        producer = pSource;
    }
    /**
@@ -155,44 +155,44 @@ public final class BufferedImageFactory {
    /**
     * Sets the source region (AOI) for the new image.
     *
-     * @param region the source region
+     * @param pRegion the source region
     */
-    public void setSourceRegion(final Rectangle region) {
+    public void setSourceRegion(final Rectangle pRegion) {
        // Re-fetch everything, if region changed
-        if (x != region.x || y != region.y || width != region.width || height != region.height) {
+        if (x != pRegion.x || y != pRegion.y || width != pRegion.width || height != pRegion.height) {
            dispose();
        }
-        x = region.x;
+        x = pRegion.x;
-        y = region.y;
+        y = pRegion.y;
-        width = region.width;
+        width = pRegion.width;
-        height = region.height;
+        height = pRegion.height;
    }
    /**
     * Sets the source subsampling for the new image.
     *
-     * @param xSubsampling horizontal subsampling factor
+     * @param pXSub horizontal subsampling factor
-     * @param ySubsampling vertical subsampling factor
+     * @param pYSub vertical subsampling factor
     */
-    public void setSourceSubsampling(int xSubsampling, int ySubsampling) {
+    public void setSourceSubsampling(int pXSub, int pYSub) {
        // Re-fetch everything, if subsampling changed
-        if (xSub != xSubsampling || ySub != ySubsampling) {
+        if (xSub != pXSub || ySub != pYSub) {
            dispose();
        }
-        if (xSubsampling > 1) {
+        if (pXSub > 1) {
-            xSub = xSubsampling;
+            xSub = pXSub;
        }
-        if (ySubsampling > 1) {
+        if (pYSub > 1) {
-            ySub = ySubsampling;
+            ySub = pYSub;
        }
    }
-    private synchronized void doFetch(final boolean colorModelOnly) throws ImageConversionException {
+    private synchronized void doFetch(boolean pColorModelOnly) throws ImageConversionException {
-        if (!fetching && (!colorModelOnly && buffered == null || buffered == null && sourceColorModel == null)) {
+        if (!fetching && (!pColorModelOnly && buffered == null || buffered == null && sourceColorModel == null)) {
            // NOTE: Subsampling is only applied if extracting full image
-            if (!colorModelOnly && (xSub > 1 || ySub > 1)) {
+            if (!pColorModelOnly && (xSub > 1 || ySub > 1)) {
                // If only sampling a region, the region must be scaled too
                if (width > 0 && height > 0) {
                    width = (width + xSub - 1) / xSub;
@@ -207,41 +207,38 @@ public final class BufferedImageFactory {
            // Start fetching
            fetching = true;
-            readColorModelOnly = colorModelOnly;
+            readColorModelOnly = pColorModelOnly;
            producer.startProduction(consumer); // Note: If single-thread (synchronous), this call will block
            // Wait until the producer wakes us up, by calling imageComplete
            while (fetching) {
                try {
-                    wait(200L);
+                    wait(200l);
                }
                catch (InterruptedException e) {
                    throw new ImageConversionException("Image conversion aborted: " + e.getMessage(), e);
                }
            }
-            try {
+            if (consumerException != null) {
-                if (consumerException != null) {
+                throw new ImageConversionException("Image conversion failed: " + consumerException.getMessage(), consumerException);
                    throw new ImageConversionException("Image conversion failed: " + consumerException.getMessage(), consumerException);
                }
                if (colorModelOnly) {
                    createColorModel();
                }
                else {
                    createBuffered();
                }
            }
-            finally {
+
-                // Clean up, in case any objects are copied/cloned, so we can free resources
+            if (pColorModelOnly) {
-                freeResources();
+                createColorModel();
            }
            else {
                createBuffered();
            }
        }
    }
    private void createColorModel() {
        colorModel = sourceColorModel;
        // Clean up, in case any objects are copied/cloned, so we can free resources
        freeResources();
    }
    private void createBuffered() {
@@ -256,9 +253,8 @@ public final class BufferedImageFactory {
            }
        }
-        if (buffered == null) {
+        // Clean up, in case any objects are copied/cloned, so we can free resources
-            throw new ImageConversionException("Could not create BufferedImage");
+        freeResources();
        }
    }
    private void freeResources() {
@@ -284,27 +280,27 @@ public final class BufferedImageFactory {
    /**
     * Adds a progress listener to this factory.
     *
-     * @param listener the progress listener
+     * @param pListener the progress listener
     */
-    public void addProgressListener(ProgressListener listener) {
+    public void addProgressListener(ProgressListener pListener) {
-        if (listener == null) {
+        if (pListener == null) {
            return;
        }
        if (listeners == null) {
-            listeners = new CopyOnWriteArrayList<>();
+            listeners = new CopyOnWriteArrayList<ProgressListener>();
        }
-        listeners.add(listener);
+        listeners.add(pListener);
    }
    /**
     * Removes a progress listener from this factory.
     *
-     * @param listener the progress listener
+     * @param pListener the progress listener
     */
-    public void removeProgressListener(ProgressListener listener) {
+    public void removeProgressListener(ProgressListener pListener) {
-        if (listener == null) {
+        if (pListener == null) {
            return;
        }
@@ -312,7 +308,7 @@ public final class BufferedImageFactory {
            return;
        }
-        listeners.remove(listener);
+        listeners.remove(pListener);
    }
    /**
@@ -328,22 +324,21 @@ public final class BufferedImageFactory {
     * Converts an array of {@code int} pixels to an array of {@code short}
     * pixels. The conversion is done, by masking out the
     * <em>higher 16 bits</em> of the {@code int}.
-     * <p>
+     *
     * For any given {@code int}, the {@code short} value is computed as
     * follows:
     * <blockquote>{@code
     * short value = (short) (intValue & 0x0000ffff);
     * }</blockquote>
     * </p>
     *
-     * @param inputPixels the pixel data to convert
+     * @param pPixels the pixel data to convert
-     * @return an array of {@code short}s, same length as {@code inputPixels}
+     * @return an array of {@code short}s, same lenght as {@code pPixels}
     */
-    private static short[] toShortPixels(int[] inputPixels) {
+    private static short[] toShortPixels(int[] pPixels) {
-        short[] pixels = new short[inputPixels.length];
+        short[] pixels = new short[pPixels.length];
        for (int i = 0; i < pixels.length; i++) {
-            pixels[i] = (short) (inputPixels[i] & 0xffff);
+            pixels[i] = (short) (pPixels[i] & 0xffff);
        }
        return pixels;
@@ -356,17 +351,17 @@ public final class BufferedImageFactory {
     * @see BufferedImageFactory#addProgressListener
     * @see BufferedImageFactory#removeProgressListener
     */
-    public interface ProgressListener extends EventListener {
+    public static interface ProgressListener extends EventListener {
        /**
         * Reports progress to this listener.
         * Invoked by the {@code BufferedImageFactory} to report progress in
         * the image decoding.
         *
-         * @param factory the factory reporting the progress
+         * @param pFactory the factory reporting the progress
-         * @param percentage the percentage of progress
+         * @param pPercentage the percentage of progress
         */
-        void progress(BufferedImageFactory factory, float percentage);
+        void progress(BufferedImageFactory pFactory, float pPercentage);
    }
    private class Consumer implements ImageConsumer {
@@ -451,18 +446,18 @@ public final class BufferedImageFactory {
            processProgress(pY + pHeight);
        }
-        public void setPixels(int x, int y, int width, int height, ColorModel colorModel, short[] pixels, int offset, int scanSize) {
+        public void setPixels(int pX, int pY, int pWidth, int pHeight, ColorModel pModel, short[] pPixels, int pOffset, int pScanSize) {
-            setPixelsImpl(x, y, width, height, colorModel, pixels, offset, scanSize);
+            setPixelsImpl(pX, pY, pWidth, pHeight, pModel, pPixels, pOffset, pScanSize);
        }
-        private void setColorModelOnce(final ColorModel colorModel) {
+        private void setColorModelOnce(final ColorModel pModel) {
            // NOTE: There seems to be a "bug" in AreaAveragingScaleFilter, as it
            // first passes the original color model through in setColorModel, then
            // later replaces it with the default RGB in the first setPixels call
            // (this is probably allowed according to the spec, but it's a waste of time and space).
-            if (sourceColorModel != colorModel) {
+            if (sourceColorModel != pModel) {
-                if (sourcePixels == null) {
+                if (/*sourceColorModel == null ||*/ sourcePixels == null) {
-                    sourceColorModel = colorModel;
+                    sourceColorModel = pModel;
                }
                else {
                    throw new IllegalStateException("Change of ColorModel after pixel delivery not supported");
@@ -475,16 +470,17 @@ public final class BufferedImageFactory {
            }
        }
-        @Override
+        public void imageComplete(int pStatus) {
        public void imageComplete(int status) {
            fetching = false;
            if (producer != null) {
                producer.removeConsumer(this);
            }
-            if (status == ImageConsumer.IMAGEERROR) {
+            switch (pStatus) {
-                consumerException = new ImageConversionException("ImageConsumer.IMAGEERROR");
+                case ImageConsumer.IMAGEERROR:
                    consumerException = new ImageConversionException("ImageConsumer.IMAGEERROR");
                break;
            }
            synchronized (BufferedImageFactory.this) {
@@ -492,18 +488,16 @@ public final class BufferedImageFactory {
            }
        }
-        @Override
+        public void setColorModel(ColorModel pModel) {
-        public void setColorModel(ColorModel colorModel) {
+            setColorModelOnce(pModel);
            setColorModelOnce(colorModel);
        }
-        @Override
+        public void setDimensions(int pWidth, int pHeight) {
        public void setDimensions(int w, int h) {
            if (width < 0) {
-                width = w - x;
+                width = pWidth - x;
            }
            if (height < 0) {
-                height = h - y;
+                height = pHeight - y;
            }
            // Hmm.. Special case, but is it a good idea?
@@ -512,31 +506,27 @@ public final class BufferedImageFactory {
            }
        }
-        @Override
+        public void setHints(int pHintflags) {
        public void setHints(int hintFlags) {
           // ignore
        }
-        @Override
+        public void setPixels(int pX, int pY, int pWidth, int pHeight, ColorModel pModel, byte[] pPixels, int pOffset, int pScanSize) {
-        public void setPixels(int x, int y, int width, int height, ColorModel colorModel, byte[] pixels, int offset, int scanSize) {
+            setPixelsImpl(pX, pY, pWidth, pHeight, pModel, pPixels, pOffset, pScanSize);
            setPixelsImpl(x, y, width, height, colorModel, pixels, offset, scanSize);
        }
-        @Override
+        public void setPixels(int pX, int pY, int pWeigth, int pHeight, ColorModel pModel, int[] pPixels, int pOffset, int pScanSize) {
-        public void setPixels(int x, int y, int width, int height, ColorModel colorModel, int[] pixels, int offset, int scanSize) {
+            if (pModel.getTransferType() == DataBuffer.TYPE_USHORT) {
            if (colorModel.getTransferType() == DataBuffer.TYPE_USHORT) {
                // NOTE: Workaround for limitation in ImageConsumer API
                // Convert int[] to short[], to be compatible with the ColorModel
-                setPixelsImpl(x, y, width, height, colorModel, toShortPixels(pixels), offset, scanSize);
+                setPixelsImpl(pX, pY, pWeigth, pHeight, pModel, toShortPixels(pPixels), pOffset, pScanSize);
            }
            else {
-                setPixelsImpl(x, y, width, height, colorModel, pixels, offset, scanSize);
+                setPixelsImpl(pX, pY, pWeigth, pHeight, pModel, pPixels, pOffset, pScanSize);
            }
        }
-        @Override
+        public void setProperties(Hashtable pProperties) {
-        public void setProperties(Hashtable properties) {
+            sourceProperties = pProperties;
            sourceProperties = properties;
        }
    }
@@ -45,8 +45,8 @@ import java.awt.image.BufferedImage;
 */
 public class BufferedImageIcon implements Icon {
    private final BufferedImage image;
-    private final int width;
+    private int width;
-    private final int height;
+    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);
+            AffineTransform xform = AffineTransform.getTranslateInstance(x, y);
-            transform.scale(width / (double) image.getWidth(), height / (double) image.getHeight());
+            xform.scale(width / (double) image.getWidth(), height / (double) image.getHeight());
-            g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+            g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
-            g2.drawImage(image, transform, null);
+                                RenderingHints.VALUE_INTERPOLATION_BILINEAR);
            g2.drawImage(image, xform, null);
        }
    }
 }
@@ -844,7 +844,7 @@ public final class ImageUtil {
                return false;
            }
-            for (int i = 0; i < mapSize1; i++) {
+            for (int i = 0; i > mapSize1; i++) {
                if (icm1.getRGB(i) != icm2.getRGB(i)) {
                    return false;
                }
@@ -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 org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import javax.imageio.ImageTypeSpecifier;
 import java.awt.color.ColorSpace;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
-import java.awt.image.BufferedImage;
+import java.awt.image.*;
 import java.awt.image.BufferedImageOp;
 import java.awt.image.DataBuffer;
 import java.awt.image.ImagingOpException;
 import java.awt.image.Raster;
 import java.awt.image.RasterOp;
 import java.util.Arrays;
 import java.util.List;
-import javax.imageio.ImageTypeSpecifier;
+import static org.junit.Assert.*;
 import org.junit.Test;
 /**
 * 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 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, anchor, anchor), 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 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, anchor, anchor), 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 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, anchor, anchor), 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 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, anchor, anchor), 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;
                }
            }
@@ -34,13 +34,14 @@ import org.junit.Ignore;
 import org.junit.Test;
 import java.awt.*;
-import java.awt.color.*;
+import java.awt.color.ColorSpace;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.ImageProducer;
 import java.awt.image.IndexColorModel;
 import java.net.URL;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 /**
 * BufferedImageFactoryTestCase
@@ -259,9 +260,9 @@ public class BufferedImageFactoryTest {
        // Listener should abort ASAP
        factory.addProgressListener(new BufferedImageFactory.ProgressListener() {
-            public void progress(BufferedImageFactory factory, float percentage) {
+            public void progress(BufferedImageFactory pFactory, float pPercentage) {
-                if (percentage > 5) {
+                if (pPercentage > 5) {
-                    factory.abort();
+                    pFactory.abort();
                }
            }
        });
@@ -342,7 +343,7 @@ public class BufferedImageFactoryTest {
        VerifyingListener listener = new VerifyingListener(factory);
        factory.addProgressListener(listener);
        factory.removeProgressListener(new BufferedImageFactory.ProgressListener() {
-            public void progress(BufferedImageFactory factory, float percentage) {
+            public void progress(BufferedImageFactory pFactory, float pPercentage) {
            }
        });
        factory.getBufferedImage();
@@ -379,11 +380,11 @@ public class BufferedImageFactoryTest {
            this.factory = factory;
        }
-        public void progress(BufferedImageFactory factory, float percentage) {
+        public void progress(BufferedImageFactory pFactory, float pPercentage) {
-            assertEquals(this.factory, factory);
+            assertEquals(factory, pFactory);
-            assertTrue(percentage >= progress && percentage <= 100f);
+            assertTrue(pPercentage >= progress && pPercentage <= 100f);
-            progress = percentage;
+            progress = pPercentage;
        }
@@ -4,13 +4,13 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>common-io</artifactId>
    <packaging>jar</packaging>
    <name>TwelveMonkeys :: Common :: IO</name>
    <description>
-        TwelveMonkeys Common I/O support classes.
+        The TwelveMonkeys Common IO support
    </description>
    <properties>
@@ -31,12 +31,4 @@
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
 </project>
@@ -56,8 +56,8 @@ public class CompoundReader extends Reader {
    private int currentReader;
    private int markedReader;
-    private long mark;
+    private int mark;
-    private long next;
+    private int mNext;
    /**
     * Create a new compound reader.
@@ -76,7 +76,7 @@ public class CompoundReader extends Reader {
        finalLock = pReaders; // NOTE: It's ok to sync on pReaders, as the
                          // reference can't change, only it's elements
-        readers = new ArrayList<>();
+        readers = new ArrayList<Reader>();
        boolean markSupported = true;
        while (pReaders.hasNext()) {
@@ -101,7 +101,7 @@ public class CompoundReader extends Reader {
        }
        // NOTE: Reset mNext for every reader, and record marked reader in mark/reset methods!
-        next = 0;
+        mNext = 0;
        return current;
    }
@@ -135,7 +135,7 @@ public class CompoundReader extends Reader {
        synchronized (finalLock) {
            ensureOpen();
-            mark = next;
+            mark = mNext;
            markedReader = currentReader;
            current.mark(pReadLimit);
@@ -158,7 +158,7 @@ public class CompoundReader extends Reader {
            }
            current.reset();
-            next = mark;
+            mNext = mark;
        }
    }
@@ -177,13 +177,13 @@ public class CompoundReader extends Reader {
                return read(); // In case of 0-length readers
            }
-            next++;
+            mNext++;
            return read;
        }
    }
-    public int read(char[] pBuffer, int pOffset, int pLength) throws IOException {
+    public int read(char pBuffer[], int pOffset, int pLength) throws IOException {
        synchronized (finalLock) {
            int read = current.read(pBuffer, pOffset, pLength);
@@ -192,7 +192,7 @@ public class CompoundReader extends Reader {
                return read(pBuffer, pOffset, pLength); // In case of 0-length readers
            }
-            next += read;
+            mNext += read;
            return read;
        }
@@ -213,7 +213,7 @@ public class CompoundReader extends Reader {
                return skip(pChars); // In case of 0-length readers
            }
-            next += skipped;
+            mNext += skipped;
            return skipped;
        }
@@ -34,7 +34,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
 /**
 * An unsynchronized {@code ByteArrayOutputStream} implementation. This version
@@ -43,8 +42,11 @@ import java.util.Arrays;
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @version $Id: FastByteArrayOutputStream.java#2 $
 */
-// TODO: Performance test of a stream impl that uses list of fixed size blocks, rather than contiguous block
+// TODO: Performance test of a stream impl that uses list of fixed size blocks, rather than contiguous block 
 public final class FastByteArrayOutputStream extends ByteArrayOutputStream {
    /** Max grow size (unless if writing more than this amount of bytes) */
    protected int maxGrowSize = 1024 * 1024; // 1 MB
    /**
     * Creates a {@code ByteArrayOutputStream} with the given initial buffer
     * size.
@@ -95,8 +97,10 @@ public final class FastByteArrayOutputStream extends ByteArrayOutputStream {
    private void growIfNeeded(int pNewCount) {
        if (pNewCount > buf.length) {
-            int newSize = Math.max(buf.length << 1, pNewCount);
+            int newSize = Math.max(Math.min(buf.length << 1, buf.length + maxGrowSize), pNewCount);
-            buf = Arrays.copyOf(buf, newSize);
+            byte[] newBuf = new byte[newSize];
            System.arraycopy(buf, 0, newBuf, 0, count);
            buf = newBuf;
        }
    }
@@ -109,7 +113,10 @@ public final class FastByteArrayOutputStream extends ByteArrayOutputStream {
    // Non-synchronized version of toByteArray
    @Override
    public byte[] toByteArray() {
-        return Arrays.copyOf(buf, count);
+        byte[] newBuf = new byte[count];
        System.arraycopy(buf, 0, newBuf, 0, count);
        return newBuf;
    }
    /**
@@ -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();
@@ -50,8 +50,8 @@ public class StringArrayReader extends StringReader {
    protected final Object finalLock;
    private int currentSting;
    private int markedString;
-    private long mark;
+    private int mark;
-    private long next;
+    private int next;
    /**
     * Create a new string array reader.
@@ -151,7 +151,7 @@ public class StringArrayReader extends StringReader {
        }
    }
-    public int read(char[] pBuffer, int pOffset, int pLength) throws IOException {
+    public int read(char pBuffer[], int pOffset, int pLength) throws IOException {
        synchronized (finalLock) {
            int read = current.read(pBuffer, pOffset, pLength);
@@ -41,20 +41,21 @@ import java.io.InputStream;
 * underlying stream.
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SubStream.java#2 $
 */
 public final class SubStream extends FilterInputStream {
    private long bytesLeft;
    private int markLimit;
    /**
-     * Creates a {@code SubStream} of the given {@code stream}.
+     * Creates a {@code SubStream} of the given {@code pStream}.
     *
-     * @param stream the underlying input stream
+     * @param pStream the underlying input stream
-     * @param length maximum number of bytes to read from this stream
+     * @param pLength maximum number of bytes to read drom this stream
     */
-    public SubStream(final InputStream stream, final long length) {
+    public SubStream(final InputStream pStream, final long pLength) {
-        super(Validate.notNull(stream, "stream"));
+        super(Validate.notNull(pStream, "stream"));
-        bytesLeft = Validate.isTrue(length >= 0, length, "length < 0: %s");
+        bytesLeft = pLength;
    }
    /**
@@ -63,23 +64,22 @@ public final class SubStream extends FilterInputStream {
     */
    @Override
    public void close() throws IOException {
-        // NOTE: Do not close the underlying stream, but consume it
+        // NOTE: Do not close the underlying stream
        while (bytesLeft > 0) {
-            if (skip(bytesLeft) <= 0 && read() < 0) {
+            //noinspection ResultOfMethodCallIgnored
-                break;
+            skip(bytesLeft);
            }
        }
    }
    @Override
    public int available() throws IOException {
-        return (int) findMaxLen(super.available());
+        return (int) Math.min(super.available(), bytesLeft);
    }
    @Override
-    public void mark(int readLimit) {
+    public void mark(int pReadLimit) {
-        super.mark(readLimit);// This either succeeds or does nothing...
+        super.mark(pReadLimit);// This either succeeds or does nothing...
-        markLimit = readLimit;
+        markLimit = pReadLimit;
    }
    @Override
@@ -93,42 +93,44 @@ public final class SubStream extends FilterInputStream {
        if (bytesLeft-- <= 0) {
            return -1;
        }
        return super.read();
    }
    @Override
-    public int read(byte[] bytes) throws IOException {
+    public final int read(byte[] pBytes) throws IOException {
-        return read(bytes, 0, bytes.length);
+        return read(pBytes, 0, pBytes.length);
    }
    @Override
-    public int read(final byte[] bytes, final int off, final int len) throws IOException {
+    public int read(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
        if (bytesLeft <= 0) {
            return -1;
        }
-        int read = super.read(bytes, off, (int) findMaxLen(len));
+        int read = super.read(pBytes, pOffset, (int) findMaxLen(pLength));
        bytesLeft = read < 0 ? 0 : bytesLeft - read;
        return read;
    }
    @Override
    public long skip(long length) throws IOException {
        long skipped = super.skip(findMaxLen(length)); // Skips 0 or more, never -1
        bytesLeft -= skipped;
        return skipped;
    }
    /**
     * Finds the maximum number of bytes we can read or skip, from this stream.
     *
-     * @param length the requested length
+     * @param pLength the requested length
     * @return the maximum number of bytes to read
     */
-    private long findMaxLen(long length) {
+    private long findMaxLen(long pLength) {
-        return bytesLeft < length ? Math.max(bytesLeft, 0) : length;
+        if (bytesLeft < pLength) {
            return (int) Math.max(bytesLeft, 0);
        }
        else {
            return pLength;
        }
    }
    @Override
    public long skip(long pLength) throws IOException {
        long skipped = super.skip(findMaxLen(pLength));// Skips 0 or more, never -1
        bytesLeft -= skipped;
        return skipped;
    }
 }
@@ -45,39 +45,39 @@ import java.nio.ByteBuffer;
 * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java#2 $
 */
 public final class DecoderStream extends FilterInputStream {
-    private final ByteBuffer buffer;
+    protected final ByteBuffer buffer;
-    private final Decoder decoder;
+    protected final Decoder decoder;
    /**
     * Creates a new decoder stream and chains it to the
-     * input stream specified by the {@code stream} argument.
+     * input stream specified by the {@code pStream} argument.
     * The stream will use a default decode buffer size.
     *
-     * @param stream the underlying input stream.
+     * @param pStream the underlying input stream.
-     * @param decoder the decoder that will be used to decode the underlying stream
+     * @param pDecoder the decoder that will be used to decode the underlying stream
     *
     * @see java.io.FilterInputStream#in
     */
-    public DecoderStream(final InputStream stream, final Decoder decoder) {
+    public DecoderStream(final InputStream pStream, final Decoder pDecoder) {
        // TODO: Let the decoder decide preferred buffer size 
-        this(stream, decoder, 1024);
+        this(pStream, pDecoder, 1024);
    }
    /**
     * Creates a new decoder stream and chains it to the
-     * input stream specified by the {@code stream} argument.
+     * input stream specified by the {@code pStream} argument.
     *
-     * @param stream the underlying input stream.
+     * @param pStream the underlying input stream.
-     * @param decoder the decoder that will be used to decode the underlying stream
+     * @param pDecoder the decoder that will be used to decode the underlying stream
-     * @param bufferSize the size of the decode buffer
+     * @param pBufferSize the size of the decode buffer
     *
     * @see java.io.FilterInputStream#in
     */
-    public DecoderStream(final InputStream stream, final Decoder decoder, final int bufferSize) {
+    public DecoderStream(final InputStream pStream, final Decoder pDecoder, final int pBufferSize) {
-        super(stream);
+        super(pStream);
-        this.decoder = decoder;
+        decoder = pDecoder;
-        buffer = ByteBuffer.allocate(bufferSize);
+        buffer = ByteBuffer.allocate(pBufferSize);
        buffer.flip();
    }
@@ -95,15 +95,15 @@ public final class DecoderStream extends FilterInputStream {
        return buffer.get() & 0xff;
    }
-    public int read(final byte[] bytes, final int offset, final int length) throws IOException {
+    public int read(final byte pBytes[], final int pOffset, final int pLength) throws IOException {
-        if (bytes == null) {
+        if (pBytes == null) {
            throw new NullPointerException();
        }
-        else if ((offset < 0) || (offset > bytes.length) || (length < 0) ||
+        else if ((pOffset < 0) || (pOffset > pBytes.length) || (pLength < 0) ||
-                ((offset + length) > bytes.length) || ((offset + length) < 0)) {
+                ((pOffset + pLength) > pBytes.length) || ((pOffset + pLength) < 0)) {
-            throw new IndexOutOfBoundsException("bytes.length=" + bytes.length + " offset=" + offset + " length=" + length);
+            throw new IndexOutOfBoundsException("bytes.length=" + pBytes.length + " offset=" + pOffset + " length=" + pLength);
        }
-        else if (length == 0) {
+        else if (pLength == 0) {
            return 0;
        }
@@ -114,11 +114,11 @@ public final class DecoderStream extends FilterInputStream {
            }
        }
-        // Read until we have read length bytes, or have reached EOF
+        // Read until we have read pLength bytes, or have reached EOF
        int count = 0;
-        int off = offset;
+        int off = pOffset;
-        while (length > count) {
+        while (pLength > count) {
            if (!buffer.hasRemaining()) {
                if (fill() < 0) {
                    break;
@@ -126,8 +126,8 @@ public final class DecoderStream extends FilterInputStream {
            }
            // Copy as many bytes as possible
-            int dstLen = Math.min(length - count, buffer.remaining());
+            int dstLen = Math.min(pLength - count, buffer.remaining());
-            buffer.get(bytes, off, dstLen);
+            buffer.get(pBytes, off, dstLen);
            // Update offset (rest)
            off += dstLen;
@@ -139,7 +139,7 @@ public final class DecoderStream extends FilterInputStream {
        return count;
    }
-    public long skip(final long length) throws IOException {
+    public long skip(final long pLength) throws IOException {
        // End of file?
        if (!buffer.hasRemaining()) {
            if (fill() < 0) {
@@ -147,10 +147,10 @@ public final class DecoderStream extends FilterInputStream {
            }
        }
-        // Skip until we have skipped length bytes, or have reached EOF
+        // Skip until we have skipped pLength bytes, or have reached EOF
        long total = 0;
-        while (total < length) {
+        while (total < pLength) {
            if (!buffer.hasRemaining()) {
                if (fill() < 0) {
                    break;
@@ -158,7 +158,7 @@ public final class DecoderStream extends FilterInputStream {
            }
            // NOTE: Skipped can never be more than avail, which is an int, so the cast is safe
-            int skipped = (int) Math.min(length - total, buffer.remaining());
+            int skipped = (int) Math.min(pLength - total, buffer.remaining());
            buffer.position(buffer.position() + skipped);
            total += skipped;
        }
@@ -174,7 +174,7 @@ public final class DecoderStream extends FilterInputStream {
     *
     * @throws IOException if an I/O error occurs
     */
-    private int fill() throws IOException {
+    protected int fill() throws IOException {
        buffer.clear();
        int read = decoder.decode(in, buffer);
@@ -45,39 +45,41 @@ import java.nio.ByteBuffer;
 * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java#2 $
 */
 public final class EncoderStream extends FilterOutputStream {
    // TODO: This class need a test case ASAP!!!
-    private final Encoder encoder;
+    protected final Encoder encoder;
    private final boolean flushOnWrite;
-    private final ByteBuffer buffer;
+    protected final ByteBuffer buffer;
    /**
     * Creates an output stream filter built on top of the specified
     * underlying output stream.
     *
-     * @param stream the underlying output stream
+     * @param pStream the underlying output stream
-     * @param encoder the encoder to use
+     * @param pEncoder the encoder to use
     */
-    public EncoderStream(final OutputStream stream, final Encoder encoder) {
+    public EncoderStream(final OutputStream pStream, final Encoder pEncoder) {
-        this(stream, encoder, false);
+        this(pStream, pEncoder, false);
    }
    /**
     * Creates an output stream filter built on top of the specified
     * underlying output stream.
     *
-     * @param stream the underlying output stream
+     * @param pStream the underlying output stream
-     * @param encoder the encoder to use
+     * @param pEncoder the encoder to use
-     * @param flushOnWrite if {@code true}, calls to the byte-array
+     * @param pFlushOnWrite if {@code true}, calls to the byte-array
     * {@code write} methods will automatically flush the buffer.
     */
-    public EncoderStream(final OutputStream stream, final Encoder encoder, final boolean flushOnWrite) {
+    public EncoderStream(final OutputStream pStream, final Encoder pEncoder, final boolean pFlushOnWrite) {
-        super(stream);
+        super(pStream);
-        this.encoder = encoder;
+        encoder = pEncoder;
-        this.flushOnWrite = flushOnWrite;
+        flushOnWrite = pFlushOnWrite;
        buffer = ByteBuffer.allocate(1024);
        buffer.flip();
    }
    public void close() throws IOException {
@@ -102,33 +104,33 @@ public final class EncoderStream extends FilterOutputStream {
        }
    }
-    public void write(final byte[] bytes) throws IOException {
+    public final void write(final byte[] pBytes) throws IOException {
-        write(bytes, 0, bytes.length);
+        write(pBytes, 0, pBytes.length);
    }
    // TODO: Verify that this works for the general case (it probably won't)...
    // TODO: We might need a way to explicitly flush the encoder, or specify
    // that the encoder can't buffer. In that case, the encoder should probably
-    // tell the EncoderStream how large buffer it prefers...
+    // tell the EncoderStream how large buffer it prefers... 
-    public void write(final byte[] values, final int offset, final int length) throws IOException {
+    public void write(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
-        if (!flushOnWrite && length < buffer.remaining()) {
+        if (!flushOnWrite && pLength < buffer.remaining()) {
            // Buffer data
-            buffer.put(values, offset, length);
+            buffer.put(pBytes, pOffset, pLength);
        }
        else {
            // Encode data already in the buffer
            encodeBuffer();
            // Encode rest without buffering
-            encoder.encode(out, ByteBuffer.wrap(values, offset, length));
+            encoder.encode(out, ByteBuffer.wrap(pBytes, pOffset, pLength));
        }
    }
-    public void write(final int value) throws IOException {
+    public void write(final int pByte) throws IOException {
        if (!buffer.hasRemaining()) {
            encodeBuffer(); // Resets bufferPos to 0
        }
-        buffer.put((byte) value);
+        buffer.put((byte) pByte);
    }
 }
@@ -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 com.twelvemonkeys.lang.StringUtil;
-import java.io.ByteArrayOutputStream;
+import org.w3c.dom.*;
-import java.io.IOException;
+import org.xml.sax.SAXException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
 import java.util.Date;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-
+import java.io.*;
-import org.w3c.dom.*;
+import java.nio.charset.Charset;
-import org.xml.sax.SAXException;
+import java.util.Date;
 import com.twelvemonkeys.lang.StringUtil;
 /**
 * 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();
@@ -1,114 +0,0 @@
 package com.twelvemonkeys.io;
 import org.junit.Test;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Random;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 /**
 * SubStreamTest.
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @author last modified by $Author: haraldk$
 * @version $Id: SubStreamTest.java,v 1.0 07/11/2023 haraldk Exp$
 */
 public class SubStreamTest {
    private final Random rng = new Random(2918475687L);
    @SuppressWarnings("resource")
    @Test(expected = IllegalArgumentException.class)
    public void testCreateNullStream() {
        new SubStream(null, 42);
    }
    @Test(expected = IllegalArgumentException.class)
    public void testCreateNegativeLength() {
        new SubStream(new ByteArrayInputStream(new byte[1]), -1);
    }
    @Test
    public void testReadAll() throws IOException {
        byte[] buf = new byte[128];
        rng.nextBytes(buf);
        try (InputStream stream = new SubStream(new ByteArrayInputStream(buf), buf.length)) {
            for (byte b : buf) {
                assertEquals(b, (byte) stream.read());
            }
            assertEquals(-1, stream.read());
        }
    }
    @Test
    public void testReadAllArray() throws IOException {
        byte[] buf = new byte[128];
        rng.nextBytes(buf);
        try (InputStream stream = new SubStream(new ByteArrayInputStream(buf), buf.length)) {
            byte[] temp = new byte[buf.length / 4];
            for (int i = 0; i < 4; i++) {
                assertEquals(temp.length, stream.read(temp)); // Depends on ByteArrayInputStream specifics...
                assertArrayEquals(Arrays.copyOfRange(buf, i * temp.length, (i + 1) * temp.length), temp);
            }
            assertEquals(-1, stream.read());
        }
    }
    @Test
    public void testSkipAll() throws IOException {
        byte[] buf = new byte[128];
        try (InputStream stream = new SubStream(new ByteArrayInputStream(buf), buf.length)) {
            assertEquals(128, stream.skip(buf.length)); // Depends on ByteArrayInputStream specifics...
            assertEquals(-1, stream.read());
        }
    }
    @SuppressWarnings("EmptyTryBlock")
    @Test
    public void testCloseConsumesAll() throws IOException {
        ByteArrayInputStream stream = new ByteArrayInputStream(new byte[128]);
        try (InputStream ignore = new SubStream(stream, 128)) {
            // Nothing here...
        }
        assertEquals(0, stream.available());
        assertEquals(-1, stream.read());
    }
    @SuppressWarnings("EmptyTryBlock")
    @Test
    public void testCloseConsumesAllLongStream() throws IOException {
        ByteArrayInputStream stream = new ByteArrayInputStream(new byte[256]);
        try (InputStream ignore = new SubStream(stream, 128)) {
            // Nothing here...
        }
        assertEquals(128, stream.available());
        assertEquals(0, stream.read());
    }
    @SuppressWarnings("EmptyTryBlock")
    @Test(timeout = 500L)
    public void testCloseConsumesAllShortStream() throws IOException {
        ByteArrayInputStream stream = new ByteArrayInputStream(new byte[13]);
        try (InputStream ignore = new SubStream(stream, 42)) {
            // Nothing here...
        }
        assertEquals(0, stream.available());
        assertEquals(-1, stream.read());
    }
 }
@@ -1,130 +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.io.enc;
 import org.junit.Test;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Random;
 import static org.junit.Assert.*;
 public class DecoderStreamTest {
    private final Random rng = new Random(5467809876546L);
    private byte[] createData(final int length) {
        byte[] data = new byte[length];
        rng.nextBytes(data);
        return data;
    }
    @Test
    public void testDecodeSingleBytes() throws IOException {
        byte[] data = createData(1327);
        InputStream source = new ByteArrayInputStream(data);
        try (InputStream stream = new DecoderStream(source, new NullDecoder())) {
            for (byte datum : data) {
                int read = stream.read();
                assertNotEquals(-1, read);
                assertEquals(datum, (byte) read);
            }
            assertEquals(-1, stream.read());
        }
    }
    @Test
    public void testDecodeArray() throws IOException {
        int length = 793;
        byte[] data = createData(length * 10);
        InputStream source = new ByteArrayInputStream(data);
        byte[] result = new byte[477];
        try (InputStream stream = new DecoderStream(source, new NullDecoder())) {
            int dataOffset = 0;
            while (dataOffset < data.length) {
                int count = stream.read(result);
                assertFalse(count <= 0);
                assertArrayEquals(Arrays.copyOfRange(data, dataOffset, dataOffset + count), Arrays.copyOfRange(result, 0, count));
                dataOffset += count;
            }
            assertEquals(-1, stream.read());
        }
    }
    @Test
    public void testDecodeArrayOffset() throws IOException {
        int length = 793;
        byte[] data = createData(length * 10);
        InputStream source = new ByteArrayInputStream(data);
        byte[] result = new byte[477];
        try (InputStream stream = new DecoderStream(source, new NullDecoder())) {
            int dataOffset = 0;
            while (dataOffset < data.length) {
                int resultOffset = dataOffset % result.length;
                int count = stream.read(result, resultOffset, result.length - resultOffset);
                assertFalse(count <= 0);
                assertArrayEquals(Arrays.copyOfRange(data, dataOffset + resultOffset, dataOffset + count), Arrays.copyOfRange(result, resultOffset, count));
                dataOffset += count;
            }
            assertEquals(-1, stream.read());
        }
    }
    private static final class NullDecoder implements Decoder {
        @Override
        public int decode(InputStream stream, ByteBuffer buffer) throws IOException {
            int read = stream.read(buffer.array(), buffer.arrayOffset(), buffer.remaining());
            if (read > 0) {
                // Set position, should be equivalent to using buffer.put(stream.read()) until EOF or buffer full
                buffer.position(read);
            }
            return read;
        }
    }
 }
@@ -1,111 +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.io.enc;
 import org.junit.Test;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Random;
 import static org.junit.Assert.assertArrayEquals;
 public class EncoderStreamTest {
    private final Random rng = new Random(5467809876546L);
    private byte[] createData(final int length) {
        byte[] data = new byte[length];
        rng.nextBytes(data);
        return data;
    }
    @Test
    public void testEncodeSingleBytes() throws IOException {
        byte[] data = createData(1327);
        ByteArrayOutputStream result = new ByteArrayOutputStream();
        try (OutputStream stream = new EncoderStream(result, new NullEncoder())) {
            for (byte datum : data) {
                stream.write(datum);
            }
        }
        assertArrayEquals(data, result.toByteArray());
    }
    @Test
    public void testEncodeArray() throws IOException {
        byte[] data = createData(1793);
        ByteArrayOutputStream result = new ByteArrayOutputStream();
        try (OutputStream stream = new EncoderStream(result, new NullEncoder())) {
            for (int i = 0; i < 10; i++) {
                stream.write(data);
            }
        }
        byte[] encoded = result.toByteArray();
        for (int i = 0; i < 10; i++) {
            assertArrayEquals(data, Arrays.copyOfRange(encoded, i * data.length, (i + 1) * data.length));
        }
    }
    @Test
    public void testEncodeArrayOffset() throws IOException {
        byte[] data = createData(87);
        ByteArrayOutputStream result = new ByteArrayOutputStream();
        try (OutputStream stream = new EncoderStream(result, new NullEncoder())) {
            for (int i = 0; i < 10; i++) {
                stream.write(data, 13, 59);
            }
        }
        byte[] original = Arrays.copyOfRange(data, 13, 13 + 59);
        byte[] encoded = result.toByteArray();
        for (int i = 0; i < 10; i++) {
            assertArrayEquals(original, Arrays.copyOfRange(encoded, i * original.length, (i + 1) * original.length));
        }
    }
    private static final class NullEncoder implements Encoder {
        @Override
        public void encode(OutputStream stream, ByteBuffer buffer) throws IOException {
            stream.write(buffer.array(), buffer.arrayOffset(), buffer.remaining());
        }
    }
 }
@@ -4,25 +4,17 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>common-lang</artifactId>
    <packaging>jar</packaging>
    <name>TwelveMonkeys :: Common :: Language support</name>
    <description>
-        TwelveMonkeys Common language support classes.
+        The TwelveMonkeys Common Language support
    </description>
    <properties>
        <project.jpms.module.name>com.twelvemonkeys.common.lang</project.jpms.module.name>
    </properties>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
 </project>
@@ -770,7 +770,6 @@ public final class StringUtil {
     */
    /*public*/
    @Deprecated
    static String formatNumber(long pNum, int pLen) throws IllegalArgumentException {
        StringBuilder result = new StringBuilder();
@@ -904,7 +903,7 @@ public final class StringUtil {
        }
        catch (ParseException pe) {
            // Wrap in RuntimeException
-            throw new IllegalArgumentException(pe.getMessage() + " at pos " + pe.getErrorOffset());
+            throw new IllegalArgumentException(pe.getMessage());
        }
    }
@@ -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;
@@ -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();
@@ -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
@@ -593,8 +593,8 @@ public class StringUtilTest {
        cal.clear();
        cal.set(Calendar.HOUR, 1);
        cal.set(Calendar.MINUTE, 2);
-        format = new SimpleDateFormat("HH:mm");
+        date = StringUtil.toDate("1:02 am",
-        date = StringUtil.toDate("1:02", format);
+                                 DateFormat.getTimeInstance(DateFormat.SHORT, Locale.US));
        assertNotNull(date);
        assertEquals(cal.getTime(), date);
    }
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <groupId>com.twelvemonkeys.common</groupId>
    <artifactId>common</artifactId>
@@ -47,7 +47,7 @@
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <version>4.13.1</version>
            <scope>test</scope>
        </dependency>
    </dependencies>
@@ -4,13 +4,13 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <groupId>com.twelvemonkeys.contrib</groupId>
    <artifactId>contrib</artifactId>
    <name>TwelveMonkeys :: Contrib</name>
    <description>
-      Contributions to TwelveMonkeys and code that doesn't fit anywhere else.
+      Contributions to TwelveMonkeys which are not matching into the ImageIO plug-ins.
    </description>
    <dependencies>
@@ -65,17 +65,8 @@
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <version>4.13.1</version>
            <scope>test</scope>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
 </project>
@@ -30,14 +30,9 @@ import static com.twelvemonkeys.contrib.tiff.TIFFUtilities.applyOrientation;
 public class EXIFUtilities {
    /**
     * Reads image and metadata, applies Exif orientation to image, and returns everything as an {@code IIOImage}.
     * The returned {@code IIOImage} will always contain an image and no raster, and
     * the {@code RenderedImage} may be safely cast to a {@code BufferedImage}.
     *
     * If no registered {@code ImageReader} claims to be able to read the input, {@code null} is returned.
     *
     * @param input a {@code URL}
-     * @return an {@code IIOImage} containing the correctly oriented image and metadata including rotation info, or
+     * @return an {@code IIOImage} containing the correctly oriented image and metadata including rotation info.
     * {@code null}.
     * @throws IOException if an error occurs during reading.
     */
    public static IIOImage readWithOrientation(final URL input) throws IOException {
@@ -48,14 +43,9 @@ public class EXIFUtilities {
    /**
     * Reads image and metadata, applies Exif orientation to image, and returns everything as an {@code IIOImage}.
     * The returned {@code IIOImage} will always contain an image and no raster, and
     * the {@code RenderedImage} may be safely cast to a {@code BufferedImage}.
     *
     * If no registered {@code ImageReader} claims to be able to read the input, {@code null} is returned.
     *
     * @param input an {@code InputStream}
-     * @return an {@code IIOImage} containing the correctly oriented image and metadata including rotation info, or
+     * @return an {@code IIOImage} containing the correctly oriented image and metadata including rotation info.
     * {@code null}.
     * @throws IOException if an error occurs during reading.
     */
    public static IIOImage readWithOrientation(final InputStream input) throws IOException {
@@ -66,14 +56,9 @@ public class EXIFUtilities {
    /**
     * Reads image and metadata, applies Exif orientation to image, and returns everything as an {@code IIOImage}.
     * The returned {@code IIOImage} will always contain an image and no raster, and
     * the {@code RenderedImage} may be safely cast to a {@code BufferedImage}.
     *
     * If no registered {@code ImageReader} claims to be able to read the input, {@code null} is returned.
     *
     * @param input a {@code File}
-     * @return an {@code IIOImage} containing the correctly oriented image and metadata including rotation info or
+     * @return an {@code IIOImage} containing the correctly oriented image and metadata including rotation info.
     * {@code null}.
     * @throws IOException if an error occurs during reading.
     */
    public static IIOImage readWithOrientation(final File input) throws IOException {
@@ -84,14 +69,9 @@ public class EXIFUtilities {
    /**
     * Reads image and metadata, applies Exif orientation to image, and returns everything as an {@code IIOImage}.
     * The returned {@code IIOImage} will always contain an image and no raster, and
     * the {@code RenderedImage} may be safely cast to a {@code BufferedImage}.
     *
     * If no registered {@code ImageReader} claims to be able to read the input, {@code null} is returned.
     *
     * @param input an {@code ImageInputStream}
-     * @return an {@code IIOImage} containing the correctly oriented image and metadata including rotation info, or
+     * @return an {@code IIOImage} containing the correctly oriented image and metadata including rotation info.
     * {@code null}.
     * @throws IOException if an error occurs during reading.
     */
    public static IIOImage readWithOrientation(final ImageInputStream input) throws IOException {
@@ -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.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-batik</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Batik Plugin</name>
@@ -17,7 +17,7 @@
    <properties>
        <project.jpms.module.name>com.twelvemonkeys.imageio.batik</project.jpms.module.name>
-        <batik.version>1.17</batik.version>
+        <batik.version>1.14</batik.version>
    </properties>
    <build>
@@ -27,24 +27,12 @@
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <systemPropertyVariables>
-                        <com.twelvemonkeys.imageio.plugins.svg.allowExternalResources>
+                        <com.twelvemonkeys.imageio.plugins.svg.allowexternalresources>
                            true
-                        </com.twelvemonkeys.imageio.plugins.svg.allowExternalResources>
+                        </com.twelvemonkeys.imageio.plugins.svg.allowexternalresources>
                    </systemPropertyVariables>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
                <configuration>
                    <instructions>
                        <Provide-Capability>
                            osgi.serviceloader;
                            osgi.serviceloader=javax.imageio.spi.ImageReaderSpi
                        </Provide-Capability>
                    </instructions>
                </configuration>
            </plugin>
        </plugins>
    </build>
@@ -60,13 +48,6 @@
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
            <version>2.15.0</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>batik-rasterizer-ext</artifactId>
@@ -87,6 +68,13 @@
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>xmlgraphics-commons</artifactId>
            <version>2.2</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>batik-anim</artifactId>
@@ -110,7 +98,7 @@
            <!--
            There seems to be some weirdness in the
            Batik/FOP poms (Batik depends on FOP 0.20-5) that screws things up,
-            making everything end up depending on Batik 1.5, not the specified version
+            making everything end up depending on Batik 1.5, not 1.6
            -->
            <exclusions>
                <exclusion>
@@ -33,12 +33,11 @@ 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.imageio.util.ImageTypeSpecifiers;
 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;
@@ -46,14 +45,11 @@ 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.*;
 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.apache.batik.xml.LexicalUnits;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.svg.SVGSVGElement;
@@ -63,8 +59,10 @@ import javax.imageio.ImageReadParam;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.spi.ImageReaderSpi;
 import java.awt.*;
-import java.awt.geom.*;
+import java.awt.geom.AffineTransform;
-import java.awt.image.*;
+import java.awt.geom.Dimension2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -78,13 +76,12 @@ import java.util.Map;
 * @author Harald Kuhr
 * @author Inpspired by code from the Batik Team
 * @version $Id: $
- * @see <a href="http://www.mail-archive.com/batik-dev@xml.apache.org/msg00992.html">batik-dev</a>
+ * @see <A href="http://www.mail-archive.com/batik-dev@xml.apache.org/msg00992.html">batik-dev</A>
 */
 public class SVGImageReader extends ImageReaderBase {
    final static boolean DEFAULT_ALLOW_EXTERNAL_RESOURCES =
-            "true".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.imageio.plugins.svg.allowExternalResources",
+            "true".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.imageio.plugins.svg.allowexternalresources"));
                    System.getProperty("com.twelvemonkeys.imageio.plugins.svg.allowexternalresources")));
    private Rasterizer rasterizer;
    private boolean allowExternalResources = DEFAULT_ALLOW_EXTERNAL_RESOURCES;
@@ -92,10 +89,10 @@ public class SVGImageReader extends ImageReaderBase {
    /**
     * Creates an {@code SVGImageReader}.
     *
-     * @param provider the provider
+     * @param pProvider the provider
     */
-    public SVGImageReader(final ImageReaderSpi provider) {
+    public SVGImageReader(final ImageReaderSpi pProvider) {
-        super(provider);
+        super(pProvider);
    }
    protected void resetMembers() {
@@ -109,20 +106,20 @@ public class SVGImageReader extends ImageReaderBase {
    }
    @Override
-    public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) {
+    public void setInput(Object pInput, boolean seekForwardOnly, boolean ignoreMetadata) {
-        super.setInput(input, seekForwardOnly, ignoreMetadata);
+        super.setInput(pInput, seekForwardOnly, ignoreMetadata);
        if (imageInput != null) {
-            TranscoderInput transcoderInput = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
+            TranscoderInput input = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
-            rasterizer.setInput(transcoderInput);
+            rasterizer.setInput(input);
        }
    }
-    public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException {
+    public BufferedImage read(int pIndex, ImageReadParam pParam) throws IOException {
-        checkBounds(imageIndex);
+        checkBounds(pIndex);
-        if (param instanceof SVGReadParam) {
+        if (pParam instanceof SVGReadParam) {
-            SVGReadParam svgParam = (SVGReadParam) param;
+            SVGReadParam svgParam = (SVGReadParam) pParam;
            // set the external-resource-resolution preference
            allowExternalResources = svgParam.isAllowExternalResources();
@@ -135,38 +132,43 @@ 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));
        }
        Dimension size = null;
-        if (param != null) {
+        if (pParam != null) {
-            size = param.getSourceRenderSize();
+            size = pParam.getSourceRenderSize();
        }
        if (size == null) {
-            size = new Dimension(getWidth(imageIndex), getHeight(imageIndex));
+            size = new Dimension(getWidth(pIndex), getHeight(pIndex));
        }
-        BufferedImage destination = getDestination(param, getImageTypes(imageIndex), size.width, size.height);
+        BufferedImage destination = getDestination(pParam, getImageTypes(pIndex), size.width, size.height);
        // Read in the image, using the Batik Transcoder
        processImageStarted(imageIndex);
        BufferedImage image = rasterizer.getImage();
        Graphics2D g = destination.createGraphics();
        try {
-            g.setComposite(AlphaComposite.Src);
+            processImageStarted(pIndex);
            g.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
            g.drawImage(image, 0, 0, null); // TODO: Dest offset?
        }
        finally {
            g.dispose();
        }
-        processImageComplete();
+            BufferedImage image = rasterizer.getImage();
-        return destination;
+            Graphics2D g = destination.createGraphics();
            try {
                g.setComposite(AlphaComposite.Src);
                g.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
                g.drawImage(image, 0, 0, null); // TODO: Dest offset?
            }
            finally {
                g.dispose();
            }
            processImageComplete();
            return destination;
        }
        catch (TranscoderException e) {
            Throwable cause = unwrapException(e);
            throw new IIOException(cause.getMessage(), cause);
        }
    }
    private static Throwable unwrapException(TranscoderException ex) {
@@ -174,18 +176,18 @@ public class SVGImageReader extends ImageReaderBase {
        return ex.getException() != null ? ex.getException() : ex;
    }
-    private TranscodingHints paramsToHints(SVGReadParam param) throws IOException {
+    private TranscodingHints paramsToHints(SVGReadParam pParam) throws IOException {
        TranscodingHints hints = new TranscodingHints();
        // Note: We must allow generic ImageReadParams, so converting to
        //       TanscodingHints should be done outside the SVGReadParam class.
        // Set dimensions
-        Dimension size = param.getSourceRenderSize();
+        Dimension size = pParam.getSourceRenderSize();
-        Rectangle viewBox = rasterizer.getViewBox();
+        Dimension origSize = new Dimension(getWidth(0), getHeight(0));
        if (size == null) {
            // SVG is not a pixel based format, but we'll scale it, according to
            // the subsampling for compatibility
-            size = getSourceRenderSizeFromSubsamping(param, viewBox.getSize());
+            size = getSourceRenderSizeFromSubsamping(pParam, origSize);
        }
        if (size != null) {
@@ -194,7 +196,7 @@ public class SVGImageReader extends ImageReaderBase {
        }
        // Set area of interest
-        Rectangle region = param.getSourceRegion();
+        Rectangle region = pParam.getSourceRegion();
        if (region != null) {
            hints.put(ImageTranscoder.KEY_AOI, region);
@@ -205,8 +207,8 @@ public class SVGImageReader extends ImageReaderBase {
            }
            else {
                // Need to resize here...
-                double xScale = size.getWidth() / viewBox.getWidth();
+                double xScale = size.getWidth() / origSize.getWidth();
-                double yScale =  size.getHeight() / viewBox.getHeight();
+                double yScale =  size.getHeight() / origSize.getHeight();
                hints.put(ImageTranscoder.KEY_WIDTH, (float) (region.getWidth() * xScale));
                hints.put(ImageTranscoder.KEY_HEIGHT, (float) (region.getHeight() * yScale));
@@ -214,11 +216,11 @@ public class SVGImageReader extends ImageReaderBase {
        }
        else if (size != null) {
            // Allow non-uniform scaling
-            hints.put(ImageTranscoder.KEY_AOI, viewBox);
+            hints.put(ImageTranscoder.KEY_AOI, new Rectangle(origSize));
        }
        // Background color
-        Paint bg = param.getBackgroundColor();
+        Paint bg = pParam.getBackgroundColor();
        if (bg != null) {
            hints.put(ImageTranscoder.KEY_BACKGROUND_COLOR, bg);
        }
@@ -226,10 +228,10 @@ public class SVGImageReader extends ImageReaderBase {
        return hints;
    }
-    private Dimension getSourceRenderSizeFromSubsamping(ImageReadParam param, Dimension origSize) {
+    private Dimension getSourceRenderSizeFromSubsamping(ImageReadParam pParam, Dimension pOrigSize) {
-        if (param.getSourceXSubsampling() > 1 || param.getSourceYSubsampling() > 1) {
+        if (pParam.getSourceXSubsampling() > 1 || pParam.getSourceYSubsampling() > 1) {
-            return new Dimension((int) (origSize.width / (float) param.getSourceXSubsampling()),
+            return new Dimension((int) (pOrigSize.width / (float) pParam.getSourceXSubsampling()),
-                    (int) (origSize.height / (float) param.getSourceYSubsampling()));
+                                 (int) (pOrigSize.height / (float) pParam.getSourceYSubsampling()));
        }
        return null;
    }
@@ -238,19 +240,28 @@ public class SVGImageReader extends ImageReaderBase {
        return new SVGReadParam();
    }
-    public int getWidth(int imageIndex) throws IOException {
+    public int getWidth(int pIndex) throws IOException {
-        checkBounds(imageIndex);
+        checkBounds(pIndex);
-
+        try {
-        return rasterizer.getDefaultWidth();
+            return rasterizer.getDefaultWidth();
        }
        catch (TranscoderException e) {
            throw new IIOException(e.getMessage(), e);
        }
    }
-    public int getHeight(int imageIndex) throws IOException {
+    public int getHeight(int pIndex) throws IOException {
-        checkBounds(imageIndex);
+        checkBounds(pIndex);
-        return rasterizer.getDefaultHeight();
+        try {
            return rasterizer.getDefaultHeight();
        }
        catch (TranscoderException e) {
            throw new IIOException(e.getMessage(), e);
        }
    }
-    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) {
+    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
-        return Collections.singleton(ImageTypeSpecifiers.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator();
+        return Collections.singleton(ImageTypeSpecifier.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator();
    }
    /**
@@ -260,11 +271,12 @@ public class SVGImageReader extends ImageReaderBase {
     * and needs major refactoring!
     * </p>
     */
-    private class Rasterizer extends SVGAbstractTranscoder {
+    private class Rasterizer extends SVGAbstractTranscoder /*ImageTranscoder*/ {
        private BufferedImage image;
        private TranscoderInput transcoderInput;
-        private final Rectangle2D viewBox = new Rectangle2D.Float();
+        private float defaultWidth;
-        private final Dimension defaultSize = new Dimension();
+        private float defaultHeight;
        private boolean initialized = false;
        private SVGOMDocument document;
        private String uri;
@@ -277,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) {
@@ -325,66 +337,54 @@ public class SVGImageReader extends ImageReaderBase {
            // ----
            SVGSVGElement rootElement = svgDoc.getRootElement();
-            // Get the viewBox
+            // get the 'width' and 'height' attributes of the SVG document
-            String viewBoxStr = rootElement.getAttributeNS(null, SVGConstants.SVG_VIEW_BOX_ATTRIBUTE);
+            UnitProcessor.Context uctx
-            if (viewBoxStr.length() != 0) {
+                    = UnitProcessor.createContext(ctx, rootElement);
                float[] rect = ViewBox.parseViewBoxAttribute(rootElement, viewBoxStr, null);
                viewBox.setFrame(rect[0], rect[1], rect[2], rect[3]);
            }
            // Get the 'width' and 'height' attributes of the SVG document
            double width = 0;
            double height = 0;
            UnitProcessor.Context uctx = UnitProcessor.createContext(ctx, rootElement);
            String widthStr = rootElement.getAttributeNS(null, SVGConstants.SVG_WIDTH_ATTRIBUTE);
            String heightStr = rootElement.getAttributeNS(null, SVGConstants.SVG_HEIGHT_ATTRIBUTE);
            if (!StringUtil.isEmpty(widthStr)) {
-                width = UnitProcessor.svgToUserSpace(widthStr, SVGConstants.SVG_WIDTH_ATTRIBUTE, UnitProcessor.HORIZONTAL_LENGTH, uctx);
+                defaultWidth = UnitProcessor.svgToUserSpace(widthStr, SVGConstants.SVG_WIDTH_ATTRIBUTE, UnitProcessor.HORIZONTAL_LENGTH, uctx);
            }
-            if (!StringUtil.isEmpty(heightStr)) {
+            if(!StringUtil.isEmpty(heightStr)){
-                height = UnitProcessor.svgToUserSpace(heightStr, SVGConstants.SVG_HEIGHT_ATTRIBUTE, UnitProcessor.VERTICAL_LENGTH, uctx);
+                defaultHeight = UnitProcessor.svgToUserSpace(heightStr, SVGConstants.SVG_HEIGHT_ATTRIBUTE, UnitProcessor.VERTICAL_LENGTH, uctx);
            }
-            boolean hasWidth = width > 0.0;
+            boolean hasWidth = defaultWidth > 0.0;
-            boolean hasHeight = height > 0.0;
+            boolean hasHeight = defaultHeight > 0.0;
            if (!hasWidth || !hasHeight) {
-                if (!viewBox.isEmpty()) {
+                String viewBoxStr = rootElement.getAttributeNS
-                    // If one dimension is given, calculate other by aspect ratio in viewBox
+                        (null, SVGConstants.SVG_VIEW_BOX_ATTRIBUTE);
                if (viewBoxStr.length() != 0) {
                    float[] rect = ViewBox.parseViewBoxAttribute(rootElement, viewBoxStr, null);
                    // if one dimension is given, calculate other by aspect ratio in viewBox
                    // or use viewBox if no dimension is given
                    if (hasWidth) {
-                        height = width * viewBox.getHeight() / viewBox.getWidth();
+                        defaultHeight = defaultWidth * rect[3] / rect[2];
                    }
                    else if (hasHeight) {
-                        width = height * viewBox.getWidth() / viewBox.getHeight();
+                        defaultWidth = defaultHeight * rect[2] / rect[3];
                    }
                    else {
-                        // ...or use viewBox if no dimension is given
+                        defaultWidth = rect[2];
-                        width = viewBox.getWidth();
+                        defaultHeight = rect[3];
                        height = viewBox.getHeight();
                    }
                }
                else {
                    // No viewBox, just assume square size
                    if (hasHeight) {
-                        width = height;
+                        defaultWidth = defaultHeight;
                    }
                    else if (hasWidth) {
-                        height = width;
+                        defaultHeight = defaultWidth;
                    }
                    else {
-                        // ...or finally fall back to Batik default sizes
+                        // fallback to batik default sizes
-                        width = 400;
+                        defaultWidth = 400;
-                        height = 400;
+                        defaultHeight = 400;
                    }
                }
            }
            // We now have a size, in the rare case we don't have a viewBox; set it to this size
            defaultSize.setSize(width, height);
            if (viewBox.isEmpty()) {
                viewBox.setRect(0, 0, width, height);
            }
            // Hack to work around exception above
            if (root != null) {
                gvtRoot = root;
@@ -397,7 +397,7 @@ public class SVGImageReader extends ImageReaderBase {
            ctx = null;
        }
-        private BufferedImage readImage() throws IOException {
+        private BufferedImage readImage() throws TranscoderException {
            init();
            if (abortRequested()) {
@@ -422,8 +422,7 @@ public class SVGImageReader extends ImageReaderBase {
                }
                if (gvtRoot == null) {
-                    Throwable cause = unwrapException(exception);
+                    throw exception;
                    throw new IIOException(cause.getMessage(), cause);
                }
            }
            ctx = context;
@@ -441,7 +440,7 @@ public class SVGImageReader extends ImageReaderBase {
            // ----
-            setImageSize(defaultSize.width, defaultSize.height);
+            setImageSize(defaultWidth, defaultHeight);
            if (abortRequested()) {
                processReadAborted();
@@ -455,17 +454,18 @@ public class SVGImageReader extends ImageReaderBase {
            try {
                Px = ViewBox.getViewTransform(ref, root, width, height, null);
            }
            catch (BridgeException ex) {
-                throw new IIOException(ex.getMessage(), ex);
+                throw new TranscoderException(ex);
            }
-            if (Px.isIdentity() && (width != defaultSize.width || height != defaultSize.height)) {
+            if (Px.isIdentity() && (width != defaultWidth || height != defaultHeight)) {
                // The document has no viewBox, we need to resize it by hand.
                // we want to keep the document size ratio
                float xscale, yscale;
-                xscale = width / defaultSize.width;
+                xscale = width / defaultWidth;
-                yscale = height / defaultSize.height;
+                yscale = height / defaultHeight;
                float scale = Math.min(xscale, yscale);
                Px = AffineTransform.getScaleInstance(scale, scale);
            }
@@ -515,7 +515,7 @@ public class SVGImageReader extends ImageReaderBase {
                }
            }
            catch (BridgeException ex) {
-                throw new IIOException(ex.getMessage(), ex);
+                throw new TranscoderException(ex);
            }
            this.root = gvtRoot;
@@ -584,7 +584,9 @@ public class SVGImageReader extends ImageReaderBase {
                return dest;
            }
            catch (Exception ex) {
-                throw new IIOException(ex.getMessage(), ex);
+                TranscoderException exception = new TranscoderException(ex.getMessage());
                exception.initCause(ex);
                throw exception;
            }
            finally {
                if (context != null) {
@@ -593,7 +595,7 @@ public class SVGImageReader extends ImageReaderBase {
            }
        }
-        private synchronized void init() throws IIOException {
+        private synchronized void init() throws TranscoderException {
            if (!initialized) {
                if (transcoderInput == null) {
                    throw new IllegalStateException("input == null");
@@ -601,18 +603,11 @@ public class SVGImageReader extends ImageReaderBase {
                initialized = true;
-                try {
+                super.transcode(transcoderInput, null);
                    super.addTranscodingHint(SVGAbstractTranscoder.KEY_ALLOW_EXTERNAL_RESOURCES, allowExternalResources);
                    super.transcode(transcoderInput, null);
                }
                catch (TranscoderException e) {
                    Throwable cause = unwrapException(e);
                    throw new IIOException(cause.getMessage(), cause);
                }
            }
        }
-        private BufferedImage getImage() throws IOException {
+        private BufferedImage getImage() throws TranscoderException {
            if (image == null) {
                image = readImage();
            }
@@ -620,23 +615,18 @@ public class SVGImageReader extends ImageReaderBase {
            return image;
        }
-        int getDefaultWidth() throws IOException {
+        int getDefaultWidth() throws TranscoderException {
            init();
-            return defaultSize.width;
+            return (int) Math.ceil(defaultWidth);
        }
-        int getDefaultHeight() throws IOException {
+        int getDefaultHeight() throws TranscoderException {
            init();
-            return defaultSize.height;
+            return (int) Math.ceil(defaultHeight);
        }
-        Rectangle getViewBox() throws IOException {
+        void setInput(final TranscoderInput pInput) {
-            init();
+            transcoderInput = pInput;
            return viewBox.getBounds();
        }
        void setInput(final TranscoderInput input) {
            transcoderInput = input;
        }
        @Override
@@ -60,22 +60,22 @@ public final class SVGImageReaderSpi extends ImageReaderSpiBase {
        super(new SVGProviderInfo());
    }
-    public boolean canDecodeInput(final Object source) throws IOException {
+    public boolean canDecodeInput(final Object pSource) throws IOException {
-        return source instanceof ImageInputStream && canDecode((ImageInputStream) source);
+        return pSource instanceof ImageInputStream && canDecode((ImageInputStream) pSource);
    }
    @SuppressWarnings("StatementWithEmptyBody")
-    private static boolean canDecode(final ImageInputStream input) throws IOException {
+    private static boolean canDecode(final ImageInputStream pInput) throws IOException {
        // NOTE: This test is quite quick as it does not involve any parsing,
        // however it may not recognize all kinds of SVG documents.
        try {
-            input.mark();
+            pInput.mark();
            // TODO: This is not ok for UTF-16 and other wide encodings
            // TODO: Use an XML (encoding) aware Reader instance instead
            // Need to figure out pretty fast if this is XML or not
            int b;
-            while (Character.isWhitespace((char) (b = input.read()))) {
+            while (Character.isWhitespace((char) (b = pInput.read()))) {
                // Skip over leading WS
            }
@@ -95,30 +95,30 @@ public final class SVGImageReaderSpi extends ImageReaderSpiBase {
            byte[] buffer = new byte[4];
            while (true) {
-                input.readFully(buffer);
+                pInput.readFully(buffer);
                if (buffer[0] == '?') {
                    // This is the XML declaration or a processing instruction
-                    while (!((input.readByte() & 0xFF) == '?' && input.read() == '>')) {
+                    while (!((pInput.readByte() & 0xFF) == '?' && pInput.read() == '>')) {
                        // Skip until end of XML declaration or processing instruction or EOF
                    }
                }
                else if (buffer[0] == '!') {
                    if (buffer[1] == '-' && buffer[2] == '-') {
                        // This is a comment
-                        while (!((input.readByte() & 0xFF) == '-' && input.read() == '-' && input.read() == '>')) {
+                        while (!((pInput.readByte() & 0xFF) == '-' && pInput.read() == '-' && pInput.read() == '>')) {
                            // Skip until end of comment or EOF
                        }
                    }
                    else if (buffer[1] == 'D' && buffer[2] == 'O' && buffer[3] == 'C'
-                            && input.read() == 'T' && input.read() == 'Y'
+                            && pInput.read() == 'T' && pInput.read() == 'Y'
-                            && input.read() == 'P' && input.read() == 'E') {
+                            && pInput.read() == 'P' && pInput.read() == 'E') {
                        // This is the DOCTYPE declaration
-                        while (Character.isWhitespace((char) (b = input.read()))) {
+                        while (Character.isWhitespace((char) (b = pInput.read()))) {
                            // Skip over WS
                        }
-                        if (b == 's' && input.read() == 'v' && input.read() == 'g') {
+                        if (b == 's' && pInput.read() == 'v' && pInput.read() == 'g') {
                            // It's SVG, identified by DOCTYPE
                            return true;
                        }
@@ -142,7 +142,7 @@ public final class SVGImageReaderSpi extends ImageReaderSpiBase {
                    return false;
                }
-                while ((input.readByte() & 0xFF) != '<') {
+                while ((pInput.readByte() & 0xFF) != '<') {
                    // Skip over, until next begin tag or EOF
                }
            }
@@ -153,7 +153,7 @@ public final class SVGImageReaderSpi extends ImageReaderSpiBase {
        }
        finally {
            //noinspection ThrowFromFinallyBlock
-            input.reset();
+            pInput.reset();
        }
    }
@@ -51,16 +51,16 @@ public class SVGReadParam extends ImageReadParam {
        return background;
    }
-    public void setBackgroundColor(Paint color) {
+    public void setBackgroundColor(Paint pColor) {
-        background = color;
+        background = pColor;
    }
    public String getBaseURI() {
        return baseURI;
    }
-    public void setBaseURI(String baseURI) {
+    public void setBaseURI(String pBaseURI) {
-        this.baseURI = baseURI;
+        baseURI = pBaseURI;
    }
    public void setAllowExternalResources(boolean allow) {
@@ -1,143 +1,141 @@
-/*
+/*
- * Copyright (c) 2008, Harald Kuhr
+ * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *
+ *
- * * Redistributions of source code must retain the above copyright notice, this
+ * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
+ *   list of conditions and the following disclaimer.
- *
+ *
- * * Redistributions in binary form must reproduce the above copyright notice,
+ * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
+ *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
+ *   and/or other materials provided with the distribution.
- *
+ *
- * * Neither the name of the copyright holder nor the names of its
+ * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
+ *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
+ *   this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * 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
+ * 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.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-
+
-package com.twelvemonkeys.imageio.plugins.wmf;
+package com.twelvemonkeys.imageio.plugins.wmf;
-
+
-import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.ImageReaderBase;
-import com.twelvemonkeys.imageio.plugins.svg.SVGImageReader;
+import com.twelvemonkeys.imageio.plugins.svg.SVGImageReader;
-import com.twelvemonkeys.imageio.plugins.svg.SVGReadParam;
+import com.twelvemonkeys.imageio.plugins.svg.SVGReadParam;
-import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
+import com.twelvemonkeys.imageio.util.IIOUtil;
-import com.twelvemonkeys.imageio.util.IIOUtil;
+import org.apache.batik.transcoder.TranscoderException;
-
+import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderException;
+import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.wmf.tosvg.WMFTranscoder;
-import org.apache.batik.transcoder.TranscoderOutput;
+
-import org.apache.batik.transcoder.wmf.tosvg.WMFTranscoder;
+import javax.imageio.IIOException;
-
+import javax.imageio.ImageIO;
-import javax.imageio.IIOException;
+import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReadParam;
+import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.spi.ImageReaderSpi;
-import javax.imageio.spi.ImageReaderSpi;
+import java.awt.image.BufferedImage;
-import java.awt.image.*;
+import java.io.*;
-import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
-import java.io.IOException;
+
-import java.io.OutputStreamWriter;
+/**
-import java.io.Writer;
+ * WMFImageReader class description.
-import java.nio.charset.StandardCharsets;
+ * 
-import java.util.Iterator;
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
-
+ * @author last modified by $Author: haku $
-/**
+ * @version $Id: WMFImageReader.java,v 1.0 29.jul.2004 13:00:59 haku Exp $
- * WMFImageReader class description.
+ */
- *
+// TODO: Probably possible to do less wrapping/unwrapping of data...
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+// TODO: Consider using temp file instead of in-memory stream
- * @author last modified by $Author: haku $
+public final class WMFImageReader extends ImageReaderBase {
- * @version $Id: WMFImageReader.java,v 1.0 29.jul.2004 13:00:59 haku Exp $
+
- */
+    private SVGImageReader reader = null;
-// TODO: Probably possible to do less wrapping/unwrapping of data...
+
-public final class WMFImageReader extends ImageReaderBase {
+    public WMFImageReader(final ImageReaderSpi pProvider) {
-
+        super(pProvider);
-    private SVGImageReader reader = null;
+    }
-
+
-    public WMFImageReader(final ImageReaderSpi pProvider) {
+    protected void resetMembers() {
-        super(pProvider);
+        if (reader != null) {
-    }
+            reader.dispose();
-
+        }
-    protected void resetMembers() {
+
-        if (reader != null) {
+        reader = null;
-            reader.dispose();
+    }
-        }
+
-
+    public BufferedImage read(int pIndex, ImageReadParam pParam) throws IOException {
-        reader = null;
+        init();
-    }
+
-
+        processImageStarted(pIndex);
-    public BufferedImage read(int pIndex, ImageReadParam pParam) throws IOException {
+
-        init();
+        BufferedImage image = reader.read(pIndex, pParam);
-
+        if (abortRequested()) {
-        processImageStarted(pIndex);
+            processReadAborted();
-
+            return image;
-        BufferedImage image = reader.read(pIndex, pParam);
+        }
-        if (abortRequested()) {
+        processImageProgress(100f);
-            processReadAborted();
+
-            return image;
+        processImageComplete();
-        }
+
-        processImageProgress(100f);
+        return image;
-
+    }
-        processImageComplete();
+
-
+    private synchronized void init() throws IOException {
-        return image;
+        // Need the extra test, to avoid throwing an IOException from the Transcoder
-    }
+        if (imageInput == null) {
-
+            throw new IllegalStateException("input == null");
-    private void init() throws IOException {
+        }
-        // Need the extra test, to avoid throwing an IOException from the Transcoder
+
-        if (imageInput == null) {
+        if (reader == null) {
-            throw new IllegalStateException("input == null");
+            WMFTranscoder transcoder = new WMFTranscoder();
-        }
+
-
+            ByteArrayOutputStream output = new ByteArrayOutputStream();
-        if (reader == null) {
+            Writer writer = new OutputStreamWriter(output, "UTF8");
-            WMFTranscoder transcoder = new WMFTranscoder();
+            try {
-            ByteArrayOutputStream output = new ByteArrayOutputStream(8192);
+                TranscoderInput in = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
-
+                TranscoderOutput out = new TranscoderOutput(writer);
-            try (Writer writer = new OutputStreamWriter(output, StandardCharsets.UTF_8)) {
+
-                TranscoderInput in = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
+                // TODO: Transcodinghints?
-                TranscoderOutput out = new TranscoderOutput(writer);
+
-
+                transcoder.transcode(in, out);
-                // TODO: Transcodinghints?
+            }
-
+            catch (TranscoderException e) {
-                transcoder.transcode(in, out);
+                throw new IIOException(e.getMessage(), e);
-            }
+            }
-            catch (TranscoderException e) {
+
-                throw new IIOException(e.getMessage(), e);
+            reader = new SVGImageReader(getOriginatingProvider());
-            }
+            reader.setInput(ImageIO.createImageInputStream(new ByteArrayInputStream(output.toByteArray())));
-
+        }
-            reader = new SVGImageReader(getOriginatingProvider());
+    }
-            reader.setInput(new ByteArrayImageInputStream(output.toByteArray()));
+
-        }
+    @Override
-    }
+    public ImageReadParam getDefaultReadParam() {
-
+        return new SVGReadParam();
-    @Override
+    }
-    public ImageReadParam getDefaultReadParam() {
+
-        return new SVGReadParam();
+    public int getWidth(int pIndex) throws IOException {
-    }
+        init();
-
+        return reader.getWidth(pIndex);
-    public int getWidth(int pIndex) throws IOException {
+    }
-        init();
+
-        return reader.getWidth(pIndex);
+    public int getHeight(int pIndex) throws IOException {
-    }
+        init();
-
+        return reader.getHeight(pIndex);
-    public int getHeight(int pIndex) throws IOException {
+    }
-        init();
+
-        return reader.getHeight(pIndex);
+    public Iterator<ImageTypeSpecifier> getImageTypes(final int pImageIndex) throws IOException {
-    }
+        init();
-
+        return reader.getImageTypes(pImageIndex);
-    public Iterator<ImageTypeSpecifier> getImageTypes(final int pImageIndex) throws IOException {
+    }
-        init();
+
-        return reader.getImageTypes(pImageIndex);
+}
    }
 }
@@ -43,7 +43,8 @@ import javax.imageio.event.IIOReadWarningListener;
 import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 import java.awt.*;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
 import java.awt.image.ImagingOpException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
@@ -52,10 +53,9 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
-import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.any;
-import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyString;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.*;
 /**
@@ -194,12 +194,12 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
        TestData redSquare = new TestData(getClassLoaderResource("/svg/red-square.svg"), dim);
        reader.setInput(redSquare.getInputStream());
        BufferedImage imageRed = reader.read(0, param);
-        assertRGBEquals("Expected all red", 0xFF0000, imageRed.getRGB(50, 50) & 0xFFFFFF, 0);
+        assertEquals(0xFF0000, imageRed.getRGB(50, 50) & 0xFFFFFF);
        TestData blueSquare = new TestData(getClassLoaderResource("/svg/blue-square.svg"), dim);
        reader.setInput(blueSquare.getInputStream());
        BufferedImage imageBlue = reader.read(0, param);
-        assertRGBEquals("Expected all blue", 0x0000FF, imageBlue.getRGB(50, 50) & 0xFFFFFF, 0);
+        assertEquals(0x0000FF, imageBlue.getRGB(50, 50) & 0xFFFFFF);
    }
    @Test
@@ -225,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();
@@ -266,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();
@@ -339,69 +339,4 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader>
            reader.dispose();
        }
    }
    @Test
    public void testReadWitSourceRenderSize() throws IOException {
        URL resource = getClassLoaderResource("/svg/circle.svg");
        SVGImageReader reader = createReader();
        TestData data = new TestData(resource, (Dimension) null);
        try (ImageInputStream stream = data.getInputStream()) {
            reader.setInput(stream);
            SVGReadParam param = reader.getDefaultReadParam();
            param.setSourceRenderSize(new Dimension(100, 100));
            BufferedImage image = reader.read(0, param);
            assertNotNull(image);
            assertEquals(100, image.getWidth());
            assertEquals(100, image.getHeight());
            // Some quick samples
            assertRGBEquals("Expected transparent corner", 0, image.getRGB(0, 0), 0);
            assertRGBEquals("Expected transparent corner", 0, image.getRGB(99, 0), 0);
            assertRGBEquals("Expected transparent corner", 0, image.getRGB(0, 99), 0);
            assertRGBEquals("Expected transparent corner", 0, image.getRGB(99, 99), 0);
            assertRGBEquals("Expected red center", 0xffff0000, image.getRGB(50, 50), 0);
        }
        finally {
            reader.dispose();
        }
    }
    @Test
    public void testReadWitSourceRenderSizeViewBoxNegativeXY() throws IOException {
        URL resource = getClassLoaderResource("/svg/Android_robot.svg");
        SVGImageReader reader = createReader();
        TestData data = new TestData(resource, (Dimension) null);
        try (ImageInputStream stream = data.getInputStream()) {
            reader.setInput(stream);
            SVGReadParam param = reader.getDefaultReadParam();
            param.setSourceRenderSize(new Dimension(219, 256)); // Aspect scaled to 256 boxed
            BufferedImage image = reader.read(0, param);
            assertNotNull(image);
            assertEquals(219, image.getWidth());
            assertEquals(256, image.getHeight());
            // Some quick samples
            assertRGBEquals("Expected transparent corner", 0, image.getRGB(0, 0), 0);
            assertRGBEquals("Expected transparent corner", 0, image.getRGB(218, 0), 0);
            assertRGBEquals("Expected transparent corner", 0, image.getRGB(0, 255), 0);
            assertRGBEquals("Expected transparent corner", 0, image.getRGB(218, 255), 0);
            assertRGBEquals("Expected green head", 0xffa4c639, image.getRGB(109, 20), 25);
            assertRGBEquals("Expected green center", 0xffa4c639, image.getRGB(109, 128), 25);
            assertRGBEquals("Expected green feet", 0xffa4c639, image.getRGB(80, 246), 25);
            assertRGBEquals("Expected green feet", 0xffa4c639, image.getRGB(130, 246), 25);
            assertRGBEquals("Expected white edge", 0xffffffff, image.getRGB(0, 128), 0);
            assertRGBEquals("Expected white edge", 0xffffffff, image.getRGB(218, 128), 0);
        }
        finally {
            reader.dispose();
        }
    }
 }
@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="100%" height="100%" viewBox="0 0 50 50" version="1.1" xmlns="http://www.w3.org/2000/svg"
     xml:space="preserve"
     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2">
    <circle cx="25" cy="25" r="25" fill="red"/></svg>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-bmp</artifactId>
    <name>TwelveMonkeys :: ImageIO :: BMP plugin</name>
@@ -26,23 +26,4 @@
            <scope>test</scope>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
                <configuration>
                    <instructions>
                        <Provide-Capability>
                            osgi.serviceloader;
                            osgi.serviceloader=javax.imageio.spi.ImageReaderSpi,
                            osgi.serviceloader;
                            osgi.serviceloader=javax.imageio.spi.ImageWriterSpi
                        </Provide-Capability>
                    </instructions>
                </configuration>
            </plugin>
        </plugins>
    </build>
 </project>
@@ -30,14 +30,15 @@
 package com.twelvemonkeys.imageio.plugins.bmp;
-import com.twelvemonkeys.imageio.ImageReaderBase;
+import java.awt.*;
-import com.twelvemonkeys.imageio.stream.SubImageInputStream;
+import java.awt.color.ColorSpace;
-import com.twelvemonkeys.imageio.util.IIOUtil;
+import java.awt.image.*;
-import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
+import java.io.DataInput;
-import com.twelvemonkeys.imageio.util.ProgressListenerBase;
+import java.io.File;
-import com.twelvemonkeys.io.LittleEndianDataInputStream;
+import java.io.IOException;
-import com.twelvemonkeys.io.enc.DecoderStream;
+import java.nio.ByteOrder;
-import com.twelvemonkeys.xml.XMLSerializer;
+import java.util.Collections;
 import java.util.Iterator;
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
@@ -50,15 +51,15 @@ 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.*;
+import com.twelvemonkeys.imageio.ImageReaderBase;
-import java.awt.image.*;
+import com.twelvemonkeys.imageio.stream.SubImageInputStream;
-import java.io.DataInput;
+import com.twelvemonkeys.imageio.util.IIOUtil;
-import java.io.File;
+import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
-import java.io.IOException;
+import com.twelvemonkeys.imageio.util.ProgressListenerBase;
-import java.nio.ByteOrder;
+import com.twelvemonkeys.io.LittleEndianDataInputStream;
-import java.util.Collections;
+import com.twelvemonkeys.io.enc.DecoderStream;
-import java.util.Iterator;
+import com.twelvemonkeys.xml.XMLSerializer;
 /**
 * ImageReader for Microsoft Windows Bitmap (BMP) format.
@@ -81,8 +82,8 @@ public final class BMPImageReader extends ImageReaderBase {
        super(new BMPImageReaderSpi());
    }
-    BMPImageReader(final ImageReaderSpi provider) {
+    protected BMPImageReader(final ImageReaderSpi pProvider) {
-        super(provider);
+        super(pProvider);
    }
    @Override
@@ -129,7 +130,6 @@ public final class BMPImageReader extends ImageReaderBase {
            // Read DIB header
            header = DIBHeader.read(imageInput);
 //            System.out.println("header = " + header);
            if (pixelOffset < header.size + DIB.BMP_FILE_HEADER_SIZE) {
                throw new IIOException("Invalid pixel offset: " + pixelOffset);
@@ -187,30 +187,30 @@ public final class BMPImageReader extends ImageReaderBase {
    }
    @Override
-    public int getWidth(int imageIndex) throws IOException {
+    public int getWidth(int pImageIndex) throws IOException {
-        checkBounds(imageIndex);
+        checkBounds(pImageIndex);
        return header.getWidth();
    }
    @Override
-    public int getHeight(int imageIndex) throws IOException {
+    public int getHeight(int pImageIndex) throws IOException {
-        checkBounds(imageIndex);
+        checkBounds(pImageIndex);
        return header.getHeight();
    }
    @Override
-    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
+    public Iterator<ImageTypeSpecifier> getImageTypes(int pImageIndex) throws IOException {
-        checkBounds(imageIndex);
+        checkBounds(pImageIndex);
        // TODO: Better implementation, include INT_RGB types for 3BYTE_BGR and 4BYTE_ABGR for INT_ARGB
-        return Collections.singletonList(getRawImageType(imageIndex)).iterator();
+        return Collections.singletonList(getRawImageType(pImageIndex)).iterator();
    }
    @Override
-    public ImageTypeSpecifier getRawImageType(int imageIndex) throws IOException {
+    public ImageTypeSpecifier getRawImageType(int pImageIndex) throws IOException {
-        checkBounds(imageIndex);
+        checkBounds(pImageIndex);
        if (header.getPlanes() != 1) {
            throw new IIOException("Multiple planes not supported");
@@ -363,18 +363,14 @@ public final class BMPImageReader extends ImageReaderBase {
        processImageStarted(imageIndex);
        for (int y = 0; y < height; y++) {
-            int bitCount = header.getBitCount();
+            switch (header.getBitCount()) {
            switch (bitCount) {
                case 1:
                case 2:
                case 4:
                case 8:
                case 24:
                    byte[] rowDataByte = ((DataBufferByte) rowRaster.getDataBuffer()).getData();
-                    int bitsPerSample = bitCount == 24 ? 8 : bitCount;
+                    readRowByte(input, height, srcRegion, xSub, ySub, rowDataByte, destRaster, clippedRow, y);
                    int samplesPerPixel = bitCount == 24 ? 3 : 1;
                    readRowByte(input, height, srcRegion, xSub, ySub, bitsPerSample, samplesPerPixel, rowDataByte, destRaster, clippedRow, y);
                    break;
                case 16:
@@ -388,7 +384,7 @@ public final class BMPImageReader extends ImageReaderBase {
                    break;
                default:
-                    throw new AssertionError("Unsupported pixel depth: " + bitCount);
+                    throw new AssertionError("Unsupported pixel depth: " + header.getBitCount());
            }
            processImageProgress(100f * y / height);
@@ -485,14 +481,9 @@ public final class BMPImageReader extends ImageReaderBase {
    }
    private void readRowByte(final DataInput input, final int height, final Rectangle srcRegion, final int xSub, final int ySub,
                             int bitsPerSample, int samplesPerPixel,
                             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;
@@ -502,20 +493,24 @@ public final class BMPImageReader extends ImageReaderBase {
        // Subsample horizontal
        if (xSub != 1) {
-            IIOUtil.subsampleRow(rowDataByte, srcRegion.x, srcRegion.width, rowDataByte, 0, samplesPerPixel, bitsPerSample, xSub);
+            for (int x = 0; x < srcRegion.width / xSub; x++) {
                rowDataByte[srcRegion.x + x] = rowDataByte[srcRegion.x + x * xSub];
            }
        }
-        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;
@@ -535,17 +530,19 @@ public final class BMPImageReader extends ImageReaderBase {
            }
        }
-        destChannel.setDataElements(0, dstY, srcChannel);
+        if (header.topDown) {
            destChannel.setDataElements(0, y, srcChannel);
        } else {
            // Flip into position
            int dstY = (height - 1 - y - srcRegion.y) / ySub;
            destChannel.setDataElements(0, dstY, srcChannel);
        }
    }
    private void readRowInt(final DataInput input, final int height, final Rectangle srcRegion, final int xSub, final int ySub,
                            final int[] rowDataInt, final WritableRaster destChannel, final Raster srcChannel, final int y) throws IOException {
        // Flip into position?
        int srcY = !header.topDown ? height - 1 - y : y;
        int dstY = (srcY - srcRegion.y) / ySub;
        // If subsampled or outside source region, skip entire row
-        if (srcY % ySub != 0 || srcY < srcRegion.y || srcY >= srcRegion.y + srcRegion.height) {
+        if (y % ySub != 0 || height - 1 - y < srcRegion.y || height - 1 - y >= srcRegion.y + srcRegion.height) {
            input.skipBytes(rowDataInt.length * 4);
            return;
@@ -560,7 +557,13 @@ public final class BMPImageReader extends ImageReaderBase {
            }
        }
-        destChannel.setDataElements(0, dstY, srcChannel);
+        if (header.topDown) {
            destChannel.setDataElements(0, y, srcChannel);
        } else {
            // Flip into position
            int dstY = (height - 1 - y - srcRegion.y) / ySub;
            destChannel.setDataElements(0, dstY, srcChannel);
        }
    }
    // TODO: Candidate util method
@@ -686,8 +689,8 @@ public final class BMPImageReader extends ImageReaderBase {
    }
    @SuppressWarnings({ "unchecked", "UnusedDeclaration", "SameParameterValue" })
-    static <T extends Throwable> void throwAs(final Class<T> type, final Throwable throwable) throws T {
+    static <T extends Throwable> void throwAs(final Class<T> pType, final Throwable pThrowable) throws T {
-        throw (T) throwable;
+        throw (T) pThrowable;
    }
    private class ListenerDelegator extends ProgressListenerBase implements IIOReadUpdateListener, IIOReadWarningListener {
@@ -65,16 +65,16 @@ public final class BMPImageReaderSpi extends ImageReaderSpiBase {
        }
    }
-    public boolean canDecodeInput(final Object source) throws IOException {
+    public boolean canDecodeInput(final Object pSource) throws IOException {
-        return source instanceof ImageInputStream && canDecode((ImageInputStream) source);
+        return pSource instanceof ImageInputStream && canDecode((ImageInputStream) pSource);
    }
-    private static boolean canDecode(final ImageInputStream input) throws IOException {
+    private static boolean canDecode(final ImageInputStream pInput) throws IOException {
        byte[] fileHeader = new byte[18]; // Strictly: file header (14 bytes) + BMP header size field (4 bytes)
        try {
-            input.mark();
+            pInput.mark();
-            input.readFully(fileHeader);
+            pInput.readFully(fileHeader);
            // Magic: BM
            if (fileHeader[0] != 'B' || fileHeader[1] != 'M') {
@@ -112,15 +112,15 @@ public final class BMPImageReaderSpi extends ImageReaderSpiBase {
            }
        }
        finally {
-            input.reset();
+            pInput.reset();
        }
    }
-    public ImageReader createReaderInstance(final Object extension) {
+    public ImageReader createReaderInstance(final Object pExtension) throws IOException {
        return new BMPImageReader(this);
    }
-    public String getDescription(final Locale locale) {
+    public String getDescription(final Locale pLocale) {
        return "Windows Device Independent Bitmap Format (BMP) Reader";
    }
 }
@@ -47,7 +47,7 @@ import java.nio.ByteOrder;
 * BMPImageWriter
 */
 public final class BMPImageWriter extends DIBImageWriter {
-    BMPImageWriter(ImageWriterSpi provider) {
+    protected BMPImageWriter(ImageWriterSpi provider) {
        super(provider);
    }
@@ -32,7 +32,6 @@ package com.twelvemonkeys.imageio.plugins.bmp;
 import com.twelvemonkeys.imageio.AbstractMetadata;
 import com.twelvemonkeys.lang.Validate;
 import org.w3c.dom.Node;
 import javax.imageio.metadata.IIOMetadataNode;
@@ -142,7 +141,7 @@ final class BMPMetadata extends AbstractMetadata {
    @Override
    protected IIOMetadataNode getStandardChromaNode() {
        // NOTE: BMP files may contain a color map, even if true color...
-        // Not sure if this is a good idea to expose to the metadata,
+        // 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 chroma = new IIOMetadataNode("Chroma");
@@ -29,11 +29,11 @@
 */
 package com.twelvemonkeys.imageio.plugins.bmp;
 import java.awt.image.*;
 import java.io.IOException;
 import static com.twelvemonkeys.lang.Validate.notNull;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 /**
 * Describes a bitmap structure.
 *
@@ -47,9 +47,9 @@ abstract class BitmapDescriptor {
    protected BufferedImage image;
    protected BitmapMask mask;
-    public BitmapDescriptor(final DirectoryEntry entry, final DIBHeader header) {
+    public BitmapDescriptor(final DirectoryEntry pEntry, final DIBHeader pHeader) {
-        this.entry = notNull(entry, "entry");
+        entry = notNull(pEntry, "entry");;
-        this.header = notNull(header, "header");
+        header = notNull(pHeader, "header");
    }
    abstract public BufferedImage getImage() throws IOException;
@@ -75,7 +75,7 @@ abstract class BitmapDescriptor {
        return getClass().getSimpleName() + "[" + entry + ", " + header + "]";
    }
-    final void setMask(final BitmapMask mask) {
+    public final void setMask(final BitmapMask mask) {
        this.mask = mask;
    }
@@ -29,7 +29,10 @@
 */
 package com.twelvemonkeys.imageio.plugins.bmp;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
 import java.awt.image.DataBuffer;
 import java.awt.image.IndexColorModel;
 import java.awt.image.WritableRaster;
 import java.util.Hashtable;
 /**
@@ -38,13 +41,12 @@ import java.util.Hashtable;
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @version $Id: BitmapIndexed.java,v 1.0 25.feb.2006 00:29:44 haku Exp$
 */
-final class BitmapIndexed extends BitmapDescriptor {
+class BitmapIndexed extends BitmapDescriptor {
-    final int[] bits;
+    protected final int[] bits;
-    final int[] colors;
+    protected final int[] colors;
    public BitmapIndexed(final DirectoryEntry entry, final DIBHeader header) {
        super(entry, header);
    public BitmapIndexed(final DirectoryEntry pEntry, final DIBHeader pHeader) {
        super(pEntry, pHeader);
        bits = new int[getWidth() * getHeight()];
        // NOTE: We're adding space for one extra color, for transparency
@@ -57,16 +59,20 @@ final class BitmapIndexed extends BitmapDescriptor {
        IndexColorModel icm = createColorModel();
-        // We add cursor hotspot as a property to images created from CUR format.
+        // This is slightly obscure, and should probably be moved..
        // This is slightly obscure, and should probably be moved...
        Hashtable<String, Object> properties = null;
        if (entry instanceof DirectoryEntry.CUREntry) {
            properties = new Hashtable<>(1);
            properties.put("cursor_hotspot", ((DirectoryEntry.CUREntry) this.entry).getHotspot());
        }
-        WritableRaster raster = icm.createCompatibleWritableRaster(getWidth(), getHeight());
+        BufferedImage image = new BufferedImage(
-        BufferedImage image = new BufferedImage(icm, raster, icm.isAlphaPremultiplied(), properties);
+                icm,
                icm.createCompatibleWritableRaster(getWidth(), getHeight()),
                icm.isAlphaPremultiplied(), properties
        );
        WritableRaster raster = image.getRaster();
        // Make pixels transparent according to mask
        final int trans = icm.getTransparentPixel();
@@ -99,7 +105,7 @@ final class BitmapIndexed extends BitmapDescriptor {
            int index = findTransparentIndexMaybeRemap(this.colors, this.bits);
            if (index == -1) {
-                // No duplicate found, increase bit count
+                // No duplicate found, increase bitcount
                bits++;
                transparent = this.colors.length - 1;
            }
@@ -111,8 +117,10 @@ final class BitmapIndexed extends BitmapDescriptor {
        }
        // NOTE: Setting hasAlpha to true, makes things work on 1.2
-        return new IndexColorModel(bits, colors, this.colors, 0, true, transparent,
+        return new IndexColorModel(
-                                   bits <= 8 ? DataBuffer.TYPE_BYTE : DataBuffer.TYPE_USHORT);
+                bits, colors, this.colors, 0, true, transparent,
                bits <= 8 ? DataBuffer.TYPE_BYTE : DataBuffer.TYPE_USHORT
        );
    }
    private static int findTransparentIndexMaybeRemap(final int[] colors, final int[] bits) {
@@ -30,7 +30,7 @@
 package com.twelvemonkeys.imageio.plugins.bmp;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
 /**
@@ -39,17 +39,17 @@ import java.awt.image.*;
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @version $Id: BitmapMask.java,v 1.0 25.feb.2006 00:29:44 haku Exp$
 */
-final class BitmapMask extends BitmapDescriptor {
+class BitmapMask extends BitmapDescriptor {
-    final BitmapIndexed bitMask;
+    protected final BitmapIndexed bitMask;
-    public BitmapMask(final DirectoryEntry parent, final DIBHeader header) {
+    public BitmapMask(final DirectoryEntry pParent, final DIBHeader pHeader) {
-        super(parent, header);
+        super(pParent, pHeader);
-        bitMask = new BitmapIndexed(parent, header);
+        bitMask = new BitmapIndexed(pParent, pHeader);
    }
-    boolean isTransparent(final int x, final int y) {
+    boolean isTransparent(final int pX, final int pY) {
        // NOTE: 1: Fully transparent, 0: Opaque...
-        return bitMask.bits[x + y * getWidth()] != 0;
+        return bitMask.bits[pX + pY * getWidth()] != 0;
    }
    public BufferedImage getImage() {
@@ -31,7 +31,8 @@
 package com.twelvemonkeys.imageio.plugins.bmp;
 import java.awt.*;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
 /**
 * Describes an RGB/true color bitmap structure (16, 24 and 32 bits per pixel).
@@ -39,10 +40,10 @@ import java.awt.image.*;
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @version $Id: BitmapRGB.java,v 1.0 25.feb.2006 00:29:44 haku Exp$
 */
-final class BitmapRGB extends BitmapDescriptor {
+class BitmapRGB extends BitmapDescriptor {
-    public BitmapRGB(final DirectoryEntry entry, final DIBHeader header) {
+    public BitmapRGB(final DirectoryEntry pEntry, final DIBHeader pHeader) {
-        super(entry, header);
+        super(pEntry, pHeader);
    }
    @Override
@@ -70,7 +71,7 @@ final class BitmapRGB extends BitmapDescriptor {
        WritableRaster alphaRaster = masked.getAlphaRaster();
-        byte[] trans = {0x00};
+        byte[] trans = {0x0};
        for (int y = 0; y < getHeight(); y++) {
            for (int x = 0; x < getWidth(); x++) {
                if (mask.isTransparent(x, y)) {
@@ -30,10 +30,11 @@
 package com.twelvemonkeys.imageio.plugins.bmp;
-import javax.imageio.IIOException;
+import java.awt.image.BufferedImage;
 import java.awt.image.*;
 import java.io.IOException;
 import javax.imageio.IIOException;
 /**
 * Represents bitmap structures we can't read.
 * Allows for deferred exception handling, and allowing clients to read all images that can be read.
@@ -41,13 +42,13 @@ import java.io.IOException;
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @version $Id: BitmapUnsupported.java,v 1.0 25.feb.2006 00:29:44 haku Exp$
 */
-final class BitmapUnsupported extends BitmapDescriptor {
+class BitmapUnsupported extends BitmapDescriptor {
-    private final String message;
+    private String message;
-    public BitmapUnsupported(final DirectoryEntry entry, DIBHeader header, final String message) {
+    public BitmapUnsupported(final DirectoryEntry pEntry, DIBHeader header, final String pMessage) {
-        super(entry, header);
+        super(pEntry, header);
-        this.message = message;
+        message = pMessage;
    }
    @Override
@@ -48,22 +48,22 @@ public final class CURImageReader extends DIBImageReader {
        super(new CURImageReaderSpi());
    }
-    CURImageReader(final ImageReaderSpi provider) {
+    protected CURImageReader(final ImageReaderSpi pProvider) {
-        super(provider);
+        super(pProvider);
    }
    /**
     * Returns the hot spot location for the cursor.
     *
-     * @param imageIndex the index of the cursor in the current input.
+     * @param pImageIndex the index of the cursor in the current input.
     * @return the hot spot location for the cursor
     *
     * @throws java.io.IOException if an I/O exception occurs during reading of image meta data
     * @throws IndexOutOfBoundsException if {@code pImageIndex} is less than {@code 0} or greater than/equal to
     *         the number of cursors in the file
     */
-    public Point getHotSpot(final int imageIndex) throws IOException {
+    public final Point getHotSpot(final int pImageIndex) throws IOException {
-        DirectoryEntry.CUREntry entry = (DirectoryEntry.CUREntry) getEntry(imageIndex);
+        DirectoryEntry.CUREntry entry = (DirectoryEntry.CUREntry) getEntry(pImageIndex);
        return entry.getHotspot();
    }
 }
@@ -32,6 +32,7 @@ package com.twelvemonkeys.imageio.plugins.bmp;
 import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 import java.io.IOException;
 import java.util.Locale;
@@ -48,15 +49,15 @@ public final class CURImageReaderSpi extends ImageReaderSpiBase {
        super(new CURProviderInfo());
    }
-    public boolean canDecodeInput(final Object source) throws IOException {
+    public boolean canDecodeInput(final Object pSource) throws IOException {
-        return source instanceof ImageInputStream && ICOImageReaderSpi.canDecode((ImageInputStream) source, DIB.TYPE_CUR);
+        return pSource instanceof ImageInputStream && ICOImageReaderSpi.canDecode((ImageInputStream) pSource, DIB.TYPE_CUR);
    }
-    public CURImageReader createReaderInstance(final Object extension) {
+    public ImageReader createReaderInstance(final Object pExtension) throws IOException {
        return new CURImageReader(this);
    }
-    public String getDescription(final Locale locale) {
+    public String getDescription(final Locale pLocale) {
        return "Windows Cursor Format (CUR) Reader";
    }
 }
@@ -30,11 +30,12 @@
 package com.twelvemonkeys.imageio.plugins.bmp;
 import javax.imageio.IIOException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import javax.imageio.IIOException;
 /**
 * Represents the DIB (Device Independent Bitmap) Information header structure.
 *
@@ -90,17 +91,17 @@ abstract class DIBHeader {
    protected DIBHeader() {
    }
-    public static DIBHeader read(final DataInput stream) throws IOException {
+    public static DIBHeader read(final DataInput pStream) throws IOException {
-        int size = stream.readInt();
+        int size = pStream.readInt();
        DIBHeader header = createHeader(size);
-        header.read(size, stream);
+        header.read(size, pStream);
        return header;
    }
-    private static DIBHeader createHeader(final int size) throws IOException {
+    private static DIBHeader createHeader(final int pSize) throws IOException {
-        switch (size) {
+        switch (pSize) {
            case DIB.BITMAP_CORE_HEADER_SIZE:
                return new BitmapCoreHeader();
            case DIB.OS2_V2_HEADER_16_SIZE:
@@ -117,12 +118,11 @@ abstract class DIBHeader {
            case DIB.BITMAP_V5_INFO_HEADER_SIZE:
                return new BitmapV5InfoHeader();
            default:
-                throw new IIOException(String.format("Unknown Bitmap Information Header (size: %s)", size));
+                throw new IIOException(String.format("Unknown Bitmap Information Header (size: %s)", pSize));
        }
    }
-    protected abstract void read(int size, DataInput stream) throws IOException;
+    protected abstract void read(int pSize, DataInput pStream) throws IOException;
    protected abstract void write(final DataOutput stream) throws IOException;
    public final int getSize() {
        return size;
@@ -189,12 +189,12 @@ abstract class DIBHeader {
        );
    }
-    private static int[] readMasks(final DataInput stream, final boolean hasAlphaMask) throws IOException {
+    private static int[] readMasks(final DataInput pStream, final boolean hasAlphaMask) throws IOException {
        int maskCount = hasAlphaMask ? 4 : 3;
        int[] masks = new int[4];
        for (int i = 0; i < maskCount; i++) {
-            masks[i] = stream.readInt();
+            masks[i] = pStream.readInt();
        }
        return masks;
@@ -205,30 +205,24 @@ abstract class DIBHeader {
    // TODO: Get rid of code duplication below...
    static final class BitmapCoreHeader extends DIBHeader {
-        @Override
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
-        protected void read(final int size, final DataInput stream) throws IOException {
+            if (pSize != DIB.BITMAP_CORE_HEADER_SIZE) {
-            if (size != DIB.BITMAP_CORE_HEADER_SIZE) {
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, DIB.BITMAP_CORE_HEADER_SIZE));
                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.BITMAP_CORE_HEADER_SIZE));
            }
-            this.size = size;
+            size = pSize;
            // NOTE: Unlike all other headers, width and height are unsigned SHORT values (16 bit)!
-            width = stream.readUnsignedShort();
+            width = pStream.readUnsignedShort();
-            height = stream.readShort();
+            height = pStream.readShort();
            if (height < 0) {
                height = -height;
                topDown = true;
            }
-            planes = stream.readUnsignedShort();
+            planes = pStream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
        }
        @Override
        protected void write(DataOutput stream) {
            throw new UnsupportedOperationException();
        }
        public String getBMPVersion() {
@@ -248,51 +242,45 @@ abstract class DIBHeader {
     */
    static final class BitmapCoreHeaderV2 extends DIBHeader {
        @SuppressWarnings("unused")
-        @Override
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
-        protected void read(final int size, final DataInput stream) throws IOException {
+            if (pSize != DIB.OS2_V2_HEADER_SIZE && pSize != DIB.OS2_V2_HEADER_16_SIZE) {
-            if (size != DIB.OS2_V2_HEADER_SIZE && size != DIB.OS2_V2_HEADER_16_SIZE) {
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, DIB.OS2_V2_HEADER_SIZE));
                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.OS2_V2_HEADER_SIZE));
            }
-            this.size = size;
+            size = pSize;
-            width = stream.readInt();
+            width = pStream.readInt();
-            height = stream.readInt();
+            height = pStream.readInt();
            if (height < 0) {
                height = -height;
                topDown = true;
            }
-            planes = stream.readUnsignedShort();
+            planes = pStream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
-            if (size != DIB.OS2_V2_HEADER_16_SIZE) {
+            if (pSize != DIB.OS2_V2_HEADER_16_SIZE) {
-                compression = stream.readInt();
+                compression = pStream.readInt();
-                imageSize = stream.readInt();
+                imageSize = pStream.readInt();
-                xPixelsPerMeter = stream.readInt();
+                xPixelsPerMeter = pStream.readInt();
-                yPixelsPerMeter = stream.readInt();
+                yPixelsPerMeter = pStream.readInt();
-                colorsUsed = stream.readInt();
+                colorsUsed = pStream.readInt();
-                colorsImportant = stream.readInt();
+                colorsImportant = pStream.readInt();
            }
            // TODO: Use? These fields are not reflected in metadata as per now...
-            int units = stream.readShort();
+            int units = pStream.readShort();
-            int reserved = stream.readShort();
+            int reserved = pStream.readShort();
-            int recording = stream.readShort(); // Recording algorithm
+            int recording = pStream.readShort(); // Recording algorithm
-            int rendering = stream.readShort(); // Halftoning algorithm
+            int rendering = pStream.readShort(); // Halftoning algorithm
-            int size1 = stream.readInt(); // Reserved for halftoning use
+            int size1 = pStream.readInt(); // Reserved for halftoning use
-            int size2 = stream.readInt(); // Reserved for halftoning use
+            int size2 = pStream.readInt(); // Reserved for halftoning use
-            int colorEncoding = stream.readInt(); // Color model used in bitmap
+            int colorEncoding = pStream.readInt(); // Color model used in bitmap
-            int identifier = stream.readInt(); // Reserved for application use
+            int identifier = pStream.readInt(); // Reserved for application use
        }
        @Override
        protected void write(DataOutput stream) {
            throw new UnsupportedOperationException();
        }
        public String getBMPVersion() {
@@ -300,6 +288,7 @@ abstract class DIBHeader {
        }
    }
    /**
     * Represents the DIB (Device Independent Bitmap) Windows 3.0 Bitmap Information header structure.
     * This is the common format for persistent DIB structures, even if Windows
@@ -315,46 +304,44 @@ abstract class DIBHeader {
     * @see <a href="https://forums.adobe.com/message/3272950#3272950">BITMAPV3INFOHEADER</a>.
     */
    static final class BitmapInfoHeader extends DIBHeader {
-        @Override
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
-        protected void read(final int size, final DataInput stream) throws IOException {
+            if (!(pSize == DIB.BITMAP_INFO_HEADER_SIZE || pSize == DIB.BITMAP_V2_INFO_HEADER_SIZE || pSize == DIB.BITMAP_V3_INFO_HEADER_SIZE)) {
-            if (!(size == DIB.BITMAP_INFO_HEADER_SIZE || size == DIB.BITMAP_V2_INFO_HEADER_SIZE || size == DIB.BITMAP_V3_INFO_HEADER_SIZE)) {
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, DIB.BITMAP_INFO_HEADER_SIZE));
                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.BITMAP_INFO_HEADER_SIZE));
            }
-            this.size = size;
+            size = pSize;
-            width = stream.readInt();
+            width = pStream.readInt();
-            height = stream.readInt();
+            height = pStream.readInt();
            if (height < 0) {
                height = -height;
                topDown = true;
            }
-            planes = stream.readUnsignedShort();
+            planes = pStream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
-            compression = stream.readInt();
+            compression = pStream.readInt();
-            imageSize = stream.readInt();
+            imageSize = pStream.readInt();
-            xPixelsPerMeter = stream.readInt();
+            xPixelsPerMeter = pStream.readInt();
-            yPixelsPerMeter = stream.readInt();
+            yPixelsPerMeter = pStream.readInt();
-            colorsUsed = stream.readInt();
+            colorsUsed = pStream.readInt();
-            colorsImportant = stream.readInt();
+            colorsImportant = pStream.readInt();
            // Read masks if we have V2 or V3
            // or if we have compression BITFIELDS or ALPHA_BITFIELDS
-            if (this.size == DIB.BITMAP_V2_INFO_HEADER_SIZE || compression == DIB.COMPRESSION_BITFIELDS) {
+            if (size == DIB.BITMAP_V2_INFO_HEADER_SIZE || compression == DIB.COMPRESSION_BITFIELDS) {
-                masks = readMasks(stream, false);
+                masks = readMasks(pStream, false);
            }
-            else if (this.size == DIB.BITMAP_V3_INFO_HEADER_SIZE || compression == DIB.COMPRESSION_ALPHA_BITFIELDS) {
+            else if (size == DIB.BITMAP_V3_INFO_HEADER_SIZE || compression == DIB.COMPRESSION_ALPHA_BITFIELDS) {
-                masks = readMasks(stream, true);
+                masks = readMasks(pStream, true);
            }
        }
-        @Override
+        void write(final DataOutput stream) throws IOException {
        protected void write(final DataOutput stream) throws IOException {
            stream.writeInt(DIB.BITMAP_INFO_HEADER_SIZE);
            stream.writeInt(width);
@@ -372,7 +359,7 @@ abstract class DIBHeader {
            stream.writeInt(colorsUsed);
            stream.writeInt(colorsImportant);
-            // TODO: Write masks, if COMPRESSION_BITFIELDS/COMPRESSION_ALPHA_BITFIELDS
+            // TODO: Write masks, if bitfields
        }
        public String getBMPVersion() {
@@ -389,160 +376,105 @@ abstract class DIBHeader {
     * Represents the BITMAPV4INFOHEADER structure.
     */
    static final class BitmapV4InfoHeader extends DIBHeader {
-        @Override
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
-        protected void read(final int size, final DataInput stream) throws IOException {
+            if (pSize != DIB.BITMAP_V4_INFO_HEADER_SIZE) {
-            if (size != DIB.BITMAP_V4_INFO_HEADER_SIZE) {
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, DIB.BITMAP_V4_INFO_HEADER_SIZE));
                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.BITMAP_V4_INFO_HEADER_SIZE));
            }
-            this.size = size;
+            size = pSize;
-            width = stream.readInt();
+            width = pStream.readInt();
-            height = stream.readInt();
+            height = pStream.readInt();
            if (height < 0) {
                height = -height;
                topDown = true;
            }
-            planes = stream.readUnsignedShort();
+            planes = pStream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
-            compression = stream.readInt();
+            compression = pStream.readInt();
-            imageSize = stream.readInt();
+            imageSize = pStream.readInt();
-            xPixelsPerMeter = stream.readInt();
+            xPixelsPerMeter = pStream.readInt();
-            yPixelsPerMeter = stream.readInt();
+            yPixelsPerMeter = pStream.readInt();
-            colorsUsed = stream.readInt();
+            colorsUsed = pStream.readInt();
-            colorsImportant = stream.readInt();
+            colorsImportant = pStream.readInt();
-            masks = readMasks(stream, true);
+            masks = readMasks(pStream, true);
-            colorSpaceType = stream.readInt(); // Should be 0 for V4
+            colorSpaceType = pStream.readInt(); // Should be 0 for V4
            cieXYZEndpoints = new double[9];
            for (int i = 0; i < cieXYZEndpoints.length; i++) {
-                cieXYZEndpoints[i] = stream.readInt(); // TODO: Hmmm...?
+                cieXYZEndpoints[i] = pStream.readInt(); // TODO: Hmmm...?
            }
            gamma = new int[3];
            for (int i = 0; i < gamma.length; i++) {
-                gamma[i] = stream.readInt();
+                gamma[i] = pStream.readInt();
            }
        }
        public String getBMPVersion() {
            return "BMP v. 4.x";
        }
        @Override
        protected void write(DataOutput stream) throws IOException {
            stream.writeInt(DIB.BITMAP_V4_INFO_HEADER_SIZE);
            stream.writeInt(width);
            stream.writeInt(topDown ? -height : height);
            stream.writeShort(planes);
            stream.writeShort(bitCount);
            stream.writeInt(compression);
            stream.writeInt(imageSize);
            stream.writeInt(xPixelsPerMeter);
            stream.writeInt(yPixelsPerMeter);
            stream.writeInt(colorsUsed);
            stream.writeInt(colorsImportant);
            // Red, Green, Blue, Alpha masks
            stream.writeInt(masks[0]);
            stream.writeInt(masks[1]);
            stream.writeInt(masks[2]);
            stream.writeInt(masks[3]);
            // color space ("sRGB" LITTLE endian)
            stream.writeInt(DIB.LCS_sRGB);
            // 36 bytes CIE XYZ triples, unused for sRGB
            stream.writeInt(0);
            stream.writeInt(0);
            stream.writeInt(0);
            stream.writeInt(0);
            stream.writeInt(0);
            stream.writeInt(0);
            stream.writeInt(0);
            stream.writeInt(0);
            stream.writeInt(0);
            // Red gamma, unused for sRGB
            // Green gamma, unused for sRGB
            // Blue gamma, unused for sRGB
            stream.writeInt(0);
            stream.writeInt(0);
            stream.writeInt(0);
        }
    }
    /**
     * Represents the BITMAPV5INFOHEADER structure.
     */
    static final class BitmapV5InfoHeader extends DIBHeader {
-        protected void read(final int size, final DataInput stream) throws IOException {
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
-            if (size != DIB.BITMAP_V5_INFO_HEADER_SIZE) {
+            if (pSize != DIB.BITMAP_V5_INFO_HEADER_SIZE) {
-                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.BITMAP_V5_INFO_HEADER_SIZE));
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, DIB.BITMAP_V5_INFO_HEADER_SIZE));
            }
-            this.size = size;
+            size = pSize;
-            width = stream.readInt();
+            width = pStream.readInt();
-            height = stream.readInt();
+            height = pStream.readInt();
            if (height < 0) {
                height = -height;
                topDown = true;
            }
-            planes = stream.readUnsignedShort();
+            planes = pStream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
-            compression = stream.readInt();
+            compression = pStream.readInt();
-            imageSize = stream.readInt();
+            imageSize = pStream.readInt();
-            xPixelsPerMeter = stream.readInt();
+            xPixelsPerMeter = pStream.readInt();
-            yPixelsPerMeter = stream.readInt();
+            yPixelsPerMeter = pStream.readInt();
-            colorsUsed = stream.readInt();
+            colorsUsed = pStream.readInt();
-            colorsImportant = stream.readInt();
+            colorsImportant = pStream.readInt();
-            masks = readMasks(stream, true);
+            masks = readMasks(pStream, true);
-            colorSpaceType = stream.readInt();
+            colorSpaceType = pStream.readInt();
            cieXYZEndpoints = new double[9];
            for (int i = 0; i < cieXYZEndpoints.length; i++) {
-                cieXYZEndpoints[i] = stream.readInt(); // TODO: Hmmm...?
+                cieXYZEndpoints[i] = pStream.readInt(); // TODO: Hmmm...?
            }
            gamma = new int[3];
            for (int i = 0; i < gamma.length; i++) {
-                gamma[i] = stream.readInt();
+                gamma[i] = pStream.readInt();
            }
-            intent = stream.readInt(); // TODO: Verify if this is same as ICC intent
+            intent = pStream.readInt(); // TODO: Verify if this is same as ICC intent
-            profileData = stream.readInt() & 0xffffffffL;
+            profileData = pStream.readInt() & 0xffffffffL;
-            profileSize = stream.readInt() & 0xffffffffL;
+            profileSize = pStream.readInt() & 0xffffffffL;
-            stream.readInt(); // Reserved
+            pStream.readInt(); // Reserved
        }
        @Override
        protected void write(DataOutput stream) {
            throw new UnsupportedOperationException();
        }
        public String getBMPVersion() {
@@ -30,23 +30,10 @@
 package com.twelvemonkeys.imageio.plugins.bmp;
 import com.twelvemonkeys.image.ImageUtil;
 import com.twelvemonkeys.imageio.ImageReaderBase;
 import com.twelvemonkeys.imageio.stream.SubImageInputStream;
 import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
 import com.twelvemonkeys.util.WeakWeakMap;
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReadParam;
 import javax.imageio.ImageReader;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.color.*;
+import java.awt.color.ColorSpace;
-import java.awt.event.*;
+import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.image.*;
 import java.io.File;
 import java.io.IOException;
@@ -57,6 +44,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReadParam;
 import javax.imageio.ImageReader;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 import javax.swing.*;
 import com.twelvemonkeys.image.ImageUtil;
 import com.twelvemonkeys.imageio.ImageReaderBase;
 import com.twelvemonkeys.imageio.stream.SubImageInputStream;
 import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
 import com.twelvemonkeys.util.WeakWeakMap;
 /**
 * ImageReader for Microsoft Windows ICO (icon) format.
 * 1, 4, 8 bit palette support with bitmask transparency, and 16, 24 and 32 bit
@@ -79,13 +81,13 @@ abstract class DIBImageReader extends ImageReaderBase {
    private Directory directory;
    // TODO: Review these, make sure we don't have a memory leak
-    private final Map<DirectoryEntry, DIBHeader> headers = new WeakHashMap<>();
+    private Map<DirectoryEntry, DIBHeader> headers = new WeakHashMap<>();
-    private final Map<DirectoryEntry, BitmapDescriptor> descriptors = new WeakWeakMap<>();
+    private Map<DirectoryEntry, BitmapDescriptor> descriptors = new WeakWeakMap<>();
    private ImageReader pngImageReader;
-    protected DIBImageReader(final ImageReaderSpi provider) {
+    protected DIBImageReader(final ImageReaderSpi pProvider) {
-        super(provider);
+        super(pProvider);
    }
    protected void resetMembers() {
@@ -100,8 +102,8 @@ abstract class DIBImageReader extends ImageReaderBase {
        }
    }
-    public Iterator<ImageTypeSpecifier> getImageTypes(final int imageIndex) throws IOException {
+    public Iterator<ImageTypeSpecifier> getImageTypes(final int pImageIndex) throws IOException {
-        DirectoryEntry entry = getEntry(imageIndex);
+        DirectoryEntry entry = getEntry(pImageIndex);
        // NOTE: Delegate to PNG reader
        if (isPNG(entry)) {
@@ -153,39 +155,39 @@ abstract class DIBImageReader extends ImageReaderBase {
        return getDirectory().count();
    }
-    public int getWidth(final int imageIndex) throws IOException {
+    public int getWidth(final int pImageIndex) throws IOException {
-        return getEntry(imageIndex).getWidth();
+        return getEntry(pImageIndex).getWidth();
    }
-    public int getHeight(final int imageIndex) throws IOException {
+    public int getHeight(final int pImageIndex) throws IOException {
-        return getEntry(imageIndex).getHeight();
+        return getEntry(pImageIndex).getHeight();
    }
-    public BufferedImage read(final int imageIndex, final ImageReadParam param) throws IOException {
+    public BufferedImage read(final int pImageIndex, final ImageReadParam pParam) throws IOException {
-        checkBounds(imageIndex);
+        checkBounds(pImageIndex);
-        processImageStarted(imageIndex);
+        processImageStarted(pImageIndex);
-        DirectoryEntry entry = getEntry(imageIndex);
+        DirectoryEntry entry = getEntry(pImageIndex);
        BufferedImage destination;
        if (isPNG(entry)) {
            // NOTE: Special case for Windows Vista, 256x256 PNG encoded images, with no DIB header...
-            destination = readPNG(entry, param);
+            destination = readPNG(entry, pParam);
        }
        else {
            // NOTE: If param does not have explicit destination, we'll try to create a BufferedImage later,
            //       to allow for storing the cursor hotspot for CUR images
-            destination = hasExplicitDestination(param) ?
+            destination = hasExplicitDestination(pParam) ?
-                    getDestination(param, getImageTypes(imageIndex), getWidth(imageIndex), getHeight(imageIndex)) : null;
+                    getDestination(pParam, getImageTypes(pImageIndex), getWidth(pImageIndex), getHeight(pImageIndex)) : null;
            BufferedImage image = readBitmap(entry);
            // TODO: Handle AOI and subsampling inline, probably not of big importance...
-            if (param != null) {
+            if (pParam != null) {
-                image = fakeAOI(image, param);
+                image = fakeAOI(image, pParam);
-                image = ImageUtil.toBuffered(fakeSubsampling(image, param));
+                image = ImageUtil.toBuffered(fakeSubsampling(image, pParam));
            }
            if (destination == null) {
@@ -211,10 +213,10 @@ abstract class DIBImageReader extends ImageReaderBase {
        return destination;
    }
-    private boolean isPNG(final DirectoryEntry entry) throws IOException {
+    private boolean isPNG(final DirectoryEntry pEntry) throws IOException {
        long magic;
-        imageInput.seek(entry.getOffset());
+        imageInput.seek(pEntry.getOffset());
        imageInput.setByteOrder(ByteOrder.BIG_ENDIAN);
        try {
@@ -227,20 +229,22 @@ abstract class DIBImageReader extends ImageReaderBase {
        return magic == DIB.PNG_MAGIC;
    }
-    private BufferedImage readPNG(final DirectoryEntry entry, final ImageReadParam param) throws IOException {
+    private BufferedImage readPNG(final DirectoryEntry pEntry, final ImageReadParam pParam) throws IOException {
        // TODO: Consider delegating listener calls
-        return initPNGReader(entry).read(0, param);
+        return initPNGReader(pEntry).read(0, pParam);
    }
-    private Iterator<ImageTypeSpecifier> getImageTypesPNG(final DirectoryEntry entry) throws IOException {
+    private Iterator<ImageTypeSpecifier> getImageTypesPNG(final DirectoryEntry pEntry) throws IOException {
-        return initPNGReader(entry).getImageTypes(0);
+        return initPNGReader(pEntry).getImageTypes(0);
    }
-    private ImageReader initPNGReader(final DirectoryEntry entry) throws IOException {
+    private ImageReader initPNGReader(final DirectoryEntry pEntry) throws IOException {
        ImageReader pngReader = getPNGReader();
-        imageInput.seek(entry.getOffset());
+        imageInput.seek(pEntry.getOffset());
-        ImageInputStream stream = new SubImageInputStream(imageInput, entry.getSize());
+//        InputStream inputStream = IIOUtil.createStreamAdapter(imageInput, pEntry.getSize());
 //        ImageInputStream stream = ImageIO.createImageInputStream(inputStream);
        ImageInputStream stream = new SubImageInputStream(imageInput, pEntry.getSize());
        // NOTE: Will throw IOException on later reads if input is not PNG
        pngReader.setInput(stream);
@@ -267,31 +271,31 @@ abstract class DIBImageReader extends ImageReaderBase {
        return pngImageReader;
    }
-    private DIBHeader getHeader(final DirectoryEntry entry) throws IOException {
+    private DIBHeader getHeader(final DirectoryEntry pEntry) throws IOException {
-        if (!headers.containsKey(entry)) {
+        if (!headers.containsKey(pEntry)) {
-            imageInput.seek(entry.getOffset());
+            imageInput.seek(pEntry.getOffset());
            DIBHeader header = DIBHeader.read(imageInput);
-            headers.put(entry, header);
+            headers.put(pEntry, header);
        }
-        return headers.get(entry);
+        return headers.get(pEntry);
    }
-    private BufferedImage readBitmap(final DirectoryEntry entry) throws IOException {
+    private BufferedImage readBitmap(final DirectoryEntry pEntry) throws IOException {
        // TODO: Get rid of the caching, as the images are mutable
-        BitmapDescriptor descriptor = descriptors.get(entry);
+        BitmapDescriptor descriptor = descriptors.get(pEntry);
-        if (descriptor == null || !descriptors.containsKey(entry)) {
+        if (descriptor == null || !descriptors.containsKey(pEntry)) {
-            DIBHeader header = getHeader(entry);
+            DIBHeader header = getHeader(pEntry);
-            int offset = entry.getOffset() + header.getSize();
+            int offset = pEntry.getOffset() + header.getSize();
            if (offset != imageInput.getStreamPosition()) {
                imageInput.seek(offset);
            }
            // TODO: Support this, it's already in the BMP reader, spec allows RLE4 and RLE8
            if (header.getCompression() != DIB.COMPRESSION_RGB) {
-                descriptor = new BitmapUnsupported(entry, header, String.format("Unsupported compression: %d", header.getCompression()));
+                descriptor = new BitmapUnsupported(pEntry, header, String.format("Unsupported compression: %d", header.getCompression()));
            }
            else {
                int bitCount = header.getBitCount();
@@ -301,75 +305,75 @@ abstract class DIBImageReader extends ImageReaderBase {
                    case 1:
                    case 4:
                    case 8: // TODO: Gray!
-                        descriptor = new BitmapIndexed(entry, header);
+                        descriptor = new BitmapIndexed(pEntry, header);
                        readBitmapIndexed((BitmapIndexed) descriptor);
                        break;
                    // RGB style
                    case 16:
-                        descriptor = new BitmapRGB(entry, header);
+                        descriptor = new BitmapRGB(pEntry, header);
                        readBitmap16(descriptor);
                        break;
                    case 24:
-                        descriptor = new BitmapRGB(entry, header);
+                        descriptor = new BitmapRGB(pEntry, header);
                        readBitmap24(descriptor);
                        break;
                    case 32:
-                        descriptor = new BitmapRGB(entry, header);
+                        descriptor = new BitmapRGB(pEntry, header);
                        readBitmap32(descriptor);
                        break;
                    default:
-                        descriptor = new BitmapUnsupported(entry, header, String.format("Unsupported bit count %d", bitCount));
+                        descriptor = new BitmapUnsupported(pEntry, header, String.format("Unsupported bit count %d", bitCount));
                }
            }
-            descriptors.put(entry, descriptor);
+            descriptors.put(pEntry, descriptor);
        }
        return descriptor.getImage();
    }
-    private void readBitmapIndexed(final BitmapIndexed bitmap) throws IOException {
+    private void readBitmapIndexed(final BitmapIndexed pBitmap) throws IOException {
-        readColorMap(bitmap);
+        readColorMap(pBitmap);
-        switch (bitmap.getBitCount()) {
+        switch (pBitmap.getBitCount()) {
            case 1:
-                readBitmapIndexed1(bitmap, false);
+                readBitmapIndexed1(pBitmap, false);
                break;
            case 4:
-                readBitmapIndexed4(bitmap);
+                readBitmapIndexed4(pBitmap);
                break;
            case 8:
-                readBitmapIndexed8(bitmap);
+                readBitmapIndexed8(pBitmap);
                break;
        }
-        BitmapMask mask = new BitmapMask(bitmap.entry, bitmap.header);
+        BitmapMask mask = new BitmapMask(pBitmap.entry, pBitmap.header);
        readBitmapIndexed1(mask.bitMask, true);
-        bitmap.setMask(mask);
+        pBitmap.setMask(mask);
    }
-    private void readColorMap(final BitmapIndexed bitmap) throws IOException {
+    private void readColorMap(final BitmapIndexed pBitmap) throws IOException {
-        int colorCount = bitmap.getColorCount();
+        int colorCount = pBitmap.getColorCount();
        for (int i = 0; i < colorCount; i++) {
            // aRGB (a is "Reserved")
-            bitmap.colors[i] = (imageInput.readInt() & 0xffffff) | 0xff000000;
+            pBitmap.colors[i] = (imageInput.readInt() & 0xffffff) | 0xff000000;
        }
    }
-    private void readBitmapIndexed1(final BitmapIndexed bitmap, final boolean asMask) throws IOException {
+    private void readBitmapIndexed1(final BitmapIndexed pBitmap, final boolean pAsMask) throws IOException {
-        int width = adjustToPadding((bitmap.getWidth() + 7) >> 3);
+        int width = adjustToPadding((pBitmap.getWidth() + 7) >> 3);
        byte[] row = new byte[width];
-        for (int y = 0; y < bitmap.getHeight(); y++) {
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
            imageInput.readFully(row, 0, width);
            int rowPos = 0;
            int xOrVal = 0x80;
-            int pos = (bitmap.getHeight() - y - 1) * bitmap.getWidth();
+            int pos = (pBitmap.getHeight() - y - 1) * pBitmap.getWidth();
-            for (int x = 0; x < bitmap.getWidth(); x++) {
+            for (int x = 0; x < pBitmap.getWidth(); x++) {
-                bitmap.bits[pos++] = ((row[rowPos] & xOrVal) / xOrVal) & 0xFF;
+                pBitmap.bits[pos++] = ((row[rowPos] & xOrVal) / xOrVal) & 0xFF;
                if (xOrVal == 1) {
                    xOrVal = 0x80;
@@ -380,29 +384,29 @@ abstract class DIBImageReader extends ImageReaderBase {
                }
            }
-            // NOTE: If we are reading the mask, we can't abort or report progress
+            // NOTE: If we are reading the mask, we don't abort or report progress
-            if (!asMask) {
+            if (!pAsMask) {
                if (abortRequested()) {
                    processReadAborted();
                    break;
                }
-                processImageProgress(100 * y / (float) bitmap.getHeight());
+                processImageProgress(100 * y / (float) pBitmap.getHeight());
            }
        }
    }
-    private void readBitmapIndexed4(final BitmapIndexed bitmap) throws IOException {
+    private void readBitmapIndexed4(final BitmapIndexed pBitmap) throws IOException {
-        int width = adjustToPadding((bitmap.getWidth() + 1) >> 1);
+        int width = adjustToPadding((pBitmap.getWidth() + 1) >> 1);
        byte[] row = new byte[width];
-        for (int y = 0; y < bitmap.getHeight(); y++) {
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
            imageInput.readFully(row, 0, width);
            int rowPos = 0;
            boolean high4 = true;
-            int pos = (bitmap.getHeight() - y - 1) * bitmap.getWidth();
+            int pos = (pBitmap.getHeight() - y - 1) * pBitmap.getWidth();
-            for (int x = 0; x < bitmap.getWidth(); x++) {
+            for (int x = 0; x < pBitmap.getWidth(); x++) {
                int value;
                if (high4) {
@@ -413,7 +417,7 @@ abstract class DIBImageReader extends ImageReaderBase {
                    rowPos++;
                }
-                bitmap.bits[pos++] = value & 0xFF;
+                pBitmap.bits[pos++] = value & 0xFF;
                high4 = !high4;
            }
@@ -422,22 +426,22 @@ abstract class DIBImageReader extends ImageReaderBase {
                break;
            }
-            processImageProgress(100 * y / (float) bitmap.getHeight());
+            processImageProgress(100 * y / (float) pBitmap.getHeight());
        }
    }
-    private void readBitmapIndexed8(final BitmapIndexed bitmap) throws IOException {
+    private void readBitmapIndexed8(final BitmapIndexed pBitmap) throws IOException {
-        int width = adjustToPadding(bitmap.getWidth());
+        int width = adjustToPadding(pBitmap.getWidth());
        byte[] row = new byte[width];
-        for (int y = 0; y < bitmap.getHeight(); y++) {
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
            imageInput.readFully(row, 0, width);
            int rowPos = 0;
-            int pos = (bitmap.getHeight() - y - 1) * bitmap.getWidth();
+            int pos = (pBitmap.getHeight() - y - 1) * pBitmap.getWidth();
-            for (int x = 0; x < bitmap.getWidth(); x++) {
+            for (int x = 0; x < pBitmap.getWidth(); x++) {
-                bitmap.bits[pos++] = row[rowPos++] & 0xFF;
+                pBitmap.bits[pos++] = row[rowPos++] & 0xFF;
            }
            if (abortRequested()) {
@@ -445,41 +449,40 @@ abstract class DIBImageReader extends ImageReaderBase {
                break;
            }
-            processImageProgress(100 * y / (float) bitmap.getHeight());
+            processImageProgress(100 * y / (float) pBitmap.getHeight());
        }
    }
    /**
-     * @param width Bytes per scan line (i.e., 1BPP, width = 9 -> bytes = 2)
+     * @param pWidth Bytes per scan line (i.e., 1BPP, width = 9 -> bytes = 1)
     * @return padded width
     */
-    private static int adjustToPadding(final int width) {
+    private static int adjustToPadding(final int pWidth) {
-        if ((width & 0x03) != 0) {
+        if ((pWidth & 0x03) != 0) {
-             return (width & ~0x03) + 4;
+             return (pWidth & ~0x03) + 4;
        }
-
+        return pWidth;
        return width;
    }
-    private void readBitmap16(final BitmapDescriptor bitmap) throws IOException {
+    private void readBitmap16(final BitmapDescriptor pBitmap) throws IOException {
-        short[] pixels = new short[bitmap.getWidth() * bitmap.getHeight()];
+        short[] pixels = new short[pBitmap.getWidth() * pBitmap.getHeight()];
        // TODO: Support TYPE_USHORT_565 and the RGB 444/ARGB 4444 layouts
        // Will create TYPE_USHORT_555
        DirectColorModel cm = new DirectColorModel(16, 0x7C00, 0x03E0, 0x001F);
        DataBuffer buffer = new DataBufferUShort(pixels, pixels.length);
        WritableRaster raster = Raster.createPackedRaster(
-                buffer, bitmap.getWidth(), bitmap.getHeight(), bitmap.getWidth(), cm.getMasks(), null
+                buffer, pBitmap.getWidth(), pBitmap.getHeight(), pBitmap.getWidth(), cm.getMasks(), null
        );
-        bitmap.image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
+        pBitmap.image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
-        for (int y = 0; y < bitmap.getHeight(); y++) {
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
-            int offset = (bitmap.getHeight() - y - 1) * bitmap.getWidth();
+            int offset = (pBitmap.getHeight() - y - 1) * pBitmap.getWidth();
-            imageInput.readFully(pixels, offset, bitmap.getWidth());
+            imageInput.readFully(pixels, offset, pBitmap.getWidth());
            // Skip to 32 bit boundary
-            if (bitmap.getWidth() % 2 != 0) {
+            if (pBitmap.getWidth() % 2 != 0) {
                imageInput.readShort();
            }
@@ -488,14 +491,14 @@ abstract class DIBImageReader extends ImageReaderBase {
                break;
            }
-            processImageProgress(100 * y / (float) bitmap.getHeight());
+            processImageProgress(100 * y / (float) pBitmap.getHeight());
        }
        // TODO: Might be mask!?
    }
-    private void readBitmap24(final BitmapDescriptor bitmap) throws IOException {
+    private void readBitmap24(final BitmapDescriptor pBitmap) throws IOException {
-        byte[] pixels = new byte[bitmap.getWidth() * bitmap.getHeight() * 3];
+        byte[] pixels = new byte[pBitmap.getWidth() * pBitmap.getHeight() * 3];
        // Create TYPE_3BYTE_BGR
        DataBuffer buffer = new DataBufferByte(pixels, pixels.length);
@@ -506,17 +509,17 @@ abstract class DIBImageReader extends ImageReaderBase {
                cs, nBits, false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE
        );
-        int scanlineStride = bitmap.getWidth() * 3;
+        int scanlineStride = pBitmap.getWidth() * 3;
        // BMP rows are padded to 4 byte boundary
        int rowSizeBytes = ((8 * scanlineStride + 31) / 32) * 4;
        WritableRaster raster = Raster.createInterleavedRaster(
-                buffer, bitmap.getWidth(), bitmap.getHeight(), scanlineStride, 3, bOffs, null
+                buffer, pBitmap.getWidth(), pBitmap.getHeight(), scanlineStride, 3, bOffs, null
        );
-        bitmap.image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
+        pBitmap.image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
-        for (int y = 0; y < bitmap.getHeight(); y++) {
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
-            int offset = (bitmap.getHeight() - y - 1) * scanlineStride;
+            int offset = (pBitmap.getHeight() - y - 1) * scanlineStride;
            imageInput.readFully(pixels, offset, scanlineStride);
            imageInput.skipBytes(rowSizeBytes - scanlineStride);
@@ -525,38 +528,38 @@ abstract class DIBImageReader extends ImageReaderBase {
                break;
            }
-            processImageProgress(100 * y / (float) bitmap.getHeight());
+            processImageProgress(100 * y / (float) pBitmap.getHeight());
        }
        // 24 bit icons usually have a bit mask
-        if (bitmap.hasMask()) {
+        if (pBitmap.hasMask()) {
-            BitmapMask mask = new BitmapMask(bitmap.entry, bitmap.header);
+            BitmapMask mask = new BitmapMask(pBitmap.entry, pBitmap.header);
            readBitmapIndexed1(mask.bitMask, true);
-            bitmap.setMask(mask);
+            pBitmap.setMask(mask);
        }
    }
-    private void readBitmap32(final BitmapDescriptor bitmap) throws IOException {
+    private void readBitmap32(final BitmapDescriptor pBitmap) throws IOException {
-        int[] pixels = new int[bitmap.getWidth() * bitmap.getHeight()];
+        int[] pixels = new int[pBitmap.getWidth() * pBitmap.getHeight()];
        // Will create TYPE_INT_ARGB
        DirectColorModel cm = (DirectColorModel) ColorModel.getRGBdefault();
        DataBuffer buffer = new DataBufferInt(pixels, pixels.length);
        WritableRaster raster = Raster.createPackedRaster(
-                buffer, bitmap.getWidth(), bitmap.getHeight(), bitmap.getWidth(), cm.getMasks(), null
+                buffer, pBitmap.getWidth(), pBitmap.getHeight(), pBitmap.getWidth(), cm.getMasks(), null
        );
-        bitmap.image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
+        pBitmap.image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
-        for (int y = 0; y < bitmap.getHeight(); y++) {
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
-            int offset = (bitmap.getHeight() - y - 1) * bitmap.getWidth();
+            int offset = (pBitmap.getHeight() - y - 1) * pBitmap.getWidth();
-            imageInput.readFully(pixels, offset, bitmap.getWidth());
+            imageInput.readFully(pixels, offset, pBitmap.getWidth());
            if (abortRequested()) {
                processReadAborted();
                break;
            }
-            processImageProgress(100 * y / (float) bitmap.getHeight());
+            processImageProgress(100 * y / (float) pBitmap.getHeight());
        }
        // There might be a mask here as well, but we'll ignore it,
@@ -587,18 +590,18 @@ abstract class DIBImageReader extends ImageReaderBase {
        directory = Directory.read(type, imageCount, imageInput);
    }
-    final DirectoryEntry getEntry(final int imageIndex) throws IOException {
+    final DirectoryEntry getEntry(final int pImageIndex) throws IOException {
        Directory directory = getDirectory();
-        if (imageIndex < 0 || imageIndex >= directory.count()) {
+        if (pImageIndex < 0 || pImageIndex >= directory.count()) {
-            throw new IndexOutOfBoundsException(String.format("Index: %d, ImageCount: %d", imageIndex, directory.count()));
+            throw new IndexOutOfBoundsException(String.format("Index: %d, ImageCount: %d", pImageIndex, directory.count()));
        }
-        return directory.getEntry(imageIndex);
+        return directory.getEntry(pImageIndex);
    }
    /// Test code below, ignore.. :-)
-    public static void main(final String[] args) throws IOException {
+    public static void main(final String[] pArgs) throws IOException {
-        if (args.length == 0) {
+        if (pArgs.length == 0) {
            System.err.println("Please specify the icon file name");
            System.exit(1);
        }
@@ -610,7 +613,7 @@ abstract class DIBImageReader extends ImageReaderBase {
            // Ignore
        }
-        String title = new File(args[0]).getName();
+        String title = new File(pArgs[0]).getName();
        JFrame frame = createWindow(title);
        JPanel root = new JPanel(new FlowLayout());
        JScrollPane scroll =
@@ -626,7 +629,7 @@ abstract class DIBImageReader extends ImageReaderBase {
        ImageReader reader = readers.next();
-        for (String arg : args) {
+        for (String arg : pArgs) {
            JPanel panel = new JPanel(null);
            panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
            readImagesInFile(arg, reader, panel);
@@ -637,28 +640,28 @@ abstract class DIBImageReader extends ImageReaderBase {
        frame.setVisible(true);
    }
-    private static void readImagesInFile(String fileName, ImageReader reader, final Container container) throws IOException {
+    private static void readImagesInFile(String pFileName, ImageReader pReader, final Container pContainer) throws IOException {
-        File file = new File(fileName);
+        File file = new File(pFileName);
        if (!file.isFile()) {
-            System.err.println(fileName + " not found, or is no file");
+            System.err.println(pFileName + " not found, or is no file");
        }
-        reader.setInput(ImageIO.createImageInputStream(file));
+        pReader.setInput(ImageIO.createImageInputStream(file));
-        int imageCount = reader.getNumImages(true);
+        int imageCount = pReader.getNumImages(true);
        for (int i = 0; i < imageCount; i++) {
            try {
-                addImage(container, reader, i);
+                addImage(pContainer, pReader, i);
            }
            catch (Exception e) {
-                System.err.println("FileName: " + fileName);
+                System.err.println("FileName: " + pFileName);
                System.err.println("Icon: " + i);
                e.printStackTrace();
            }
        }
    }
-    private static JFrame createWindow(final String title) {
+    private static JFrame createWindow(final String pTitle) {
-        JFrame frame = new JFrame(title);
+        JFrame frame = new JFrame(pTitle);
        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
        frame.addWindowListener(new WindowAdapter() {
            public void windowClosed(WindowEvent e) {
@@ -668,15 +671,15 @@ abstract class DIBImageReader extends ImageReaderBase {
        return frame;
    }
-    private static void addImage(final Container parent, final ImageReader reader, final int imageNo) throws IOException {
+    private static void addImage(final Container pParent, final ImageReader pReader, final int pImageNo) throws IOException {
        final JButton button = new JButton();
-        BufferedImage image = reader.read(imageNo);
+        BufferedImage image = pReader.read(pImageNo);
        button.setIcon(new ImageIcon(image) {
            TexturePaint texture;
-            private void createTexture(final GraphicsConfiguration graphicsConfiguration) {
+            private void createTexture(final GraphicsConfiguration pGraphicsConfiguration) {
-                BufferedImage pattern = graphicsConfiguration.createCompatibleImage(20, 20);
+                BufferedImage pattern = pGraphicsConfiguration.createCompatibleImage(20, 20);
                Graphics2D g = pattern.createGraphics();
                try {
                    g.setColor(Color.LIGHT_GRAY);
@@ -711,6 +714,6 @@ abstract class DIBImageReader extends ImageReaderBase {
                String.valueOf(((IndexColorModel) image.getColorModel()).getMapSize()) :
                "TrueColor"));
-        parent.add(button);
+        pParent.add(button);
    }
 }
@@ -44,25 +44,24 @@ import java.util.List;
 class Directory {
    private final List<DirectoryEntry> entries;
-    private Directory(int imageCount) {
+    private Directory(int pImageCount) {
-        entries = Arrays.asList(new DirectoryEntry[imageCount]);
+        entries = Arrays.asList(new DirectoryEntry[pImageCount]);
    }
-    public static Directory read(final int type, final int imageCount, final DataInput stream) throws IOException {
+    public static Directory read(final int pType, final int pImageCount, final DataInput pStream) throws IOException {
-        Directory directory = new Directory(imageCount);
+        Directory directory = new Directory(pImageCount);
-        directory.readEntries(type,  stream);
+        directory.readEntries(pType,  pStream);
        return directory;
    }
-    private void readEntries(final int type, final DataInput stream) throws IOException {
+    private void readEntries(final int pType, final DataInput pStream) throws IOException {
        for (int i = 0; i < entries.size(); i++) {
-            entries.set(i, DirectoryEntry.read(type, stream));
+            entries.set(i, DirectoryEntry.read(pType, pStream));
        }
    }
-    public DirectoryEntry getEntry(final int entryIndex) {
+    public DirectoryEntry getEntry(final int pEntryIndex) {
-        return entries.get(entryIndex);
+        return entries.get(pEntryIndex);
    }
    public int count() {
@@ -32,7 +32,8 @@ package com.twelvemonkeys.imageio.plugins.bmp;
 import javax.imageio.IIOException;
 import java.awt.*;
-import java.awt.image.*;
+import java.awt.image.ColorModel;
 import java.awt.image.IndexColorModel;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -57,43 +58,47 @@ abstract class DirectoryEntry {
    DirectoryEntry() {
    }
-    public static DirectoryEntry read(final int type, final DataInput stream) throws IOException {
+    public static DirectoryEntry read(final int pType, final DataInput pStream) throws IOException {
-        DirectoryEntry entry = createEntry(type);
+        DirectoryEntry entry = createEntry(pType);
-        entry.read(stream);
+        entry.read(pStream);
        return entry;
    }
-    private static DirectoryEntry createEntry(int type) throws IIOException {
+    private static DirectoryEntry createEntry(int pType) throws IIOException {
-        switch (type) {
+        switch (pType) {
            case DIB.TYPE_ICO:
                return new ICOEntry();
            case DIB.TYPE_CUR:
                return new CUREntry();
            default:
-                throw new IIOException(String.format("Unknown DIB type: %s, expected: %s (ICO) or %s (CUR)", type, DIB.TYPE_ICO, DIB.TYPE_CUR));
+                throw new IIOException(
                        String.format(
                                "Unknown DIB type: %s, expected: %s (ICO) or %s (CUR)",
                                pType, DIB.TYPE_ICO, DIB.TYPE_CUR
                        )
                );
        }
    }
-    protected void read(final DataInput stream) throws IOException {
+    protected void read(final DataInput pStream) throws IOException {
        // Width/height = 0, means 256
-        int w = stream.readUnsignedByte();
+        int w = pStream.readUnsignedByte();
        width = w == 0 ? 256 : w;
-        int h = stream.readUnsignedByte();
+        int h = pStream.readUnsignedByte();
        height = h == 0 ? 256 : h;
        // Color count = 0, means 256 or more colors
-        colorCount = stream.readUnsignedByte();
+        colorCount = pStream.readUnsignedByte();
        // Ignore. Should be 0, but .NET (System.Drawing.Icon.Save) sets this value to 255, according to Wikipedia
-        stream.readUnsignedByte();
+        pStream.readUnsignedByte();
-        planes = stream.readUnsignedShort();     // Should be 0 or 1 for ICO, x hotspot for CUR
+        planes = pStream.readUnsignedShort();     // Should be 0 or 1 for ICO, x hotspot for CUR
-        bitCount = stream.readUnsignedShort();   // bit count for ICO, y hotspot for CUR
+        bitCount = pStream.readUnsignedShort();   // bit count for ICO, y hotspot for CUR
        // Size of bitmap in bytes
-        size = stream.readInt();
+        size = pStream.readInt();
-        offset = stream.readInt();
+        offset = pStream.readInt();
    }
    void write(final DataOutput output) throws IOException {
@@ -152,8 +157,8 @@ abstract class DirectoryEntry {
        private int yHotspot;
        @Override
-        protected void read(final DataInput stream) throws IOException {
+        protected void read(final DataInput pStream) throws IOException {
-            super.read(stream);
+            super.read(pStream);
            // NOTE: This is a hack...
            xHotspot = planes;
@@ -46,7 +46,7 @@ public final class ICOImageReader extends DIBImageReader {
        super(new ICOImageReaderSpi());
    }
-    ICOImageReader(final ImageReaderSpi provider) {
+    protected ICOImageReader(final ImageReaderSpi pProvider) {
-        super(provider);
+        super(pProvider);
    }
 }
@@ -32,6 +32,7 @@ package com.twelvemonkeys.imageio.plugins.bmp;
 import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 import java.io.IOException;
 import java.util.Locale;
@@ -48,32 +49,32 @@ public final class ICOImageReaderSpi extends ImageReaderSpiBase {
        super(new ICOProviderInfo());
    }
-    public boolean canDecodeInput(final Object source) throws IOException {
+    public boolean canDecodeInput(final Object pSource) throws IOException {
-        return source instanceof ImageInputStream && canDecode((ImageInputStream) source, DIB.TYPE_ICO);
+        return pSource instanceof ImageInputStream && canDecode((ImageInputStream) pSource, DIB.TYPE_ICO);
    }
-    static boolean canDecode(final ImageInputStream input, final int type) throws IOException {
+    static boolean canDecode(final ImageInputStream pInput, final int pType) throws IOException {
        byte[] signature = new byte[4];
        try {
-            input.mark();
+            pInput.mark();
-            input.readFully(signature);
+            pInput.readFully(signature);
-            int count = input.readByte() + (input.readByte() << 8);
+            int count = pInput.readByte() + (pInput.readByte() << 8);
-            return (signature[0] == 0x0 && signature[1] == 0x0 && signature[2] == type
+            return (signature[0] == 0x0 && signature[1] == 0x0 && signature[2] == pType
                    && signature[3] == 0x0 && count > 0);
        }
        finally {
-            input.reset();
+            pInput.reset();
        }
    }
-    public ICOImageReader createReaderInstance(final Object extension) {
+    public ImageReader createReaderInstance(final Object pExtension) throws IOException {
        return new ICOImageReader(this);
    }
-    public String getDescription(final Locale locale) {
+    public String getDescription(final Locale pLocale) {
        return "Windows Icon Format (ICO) Reader";
    }
 }
@@ -33,19 +33,15 @@ package com.twelvemonkeys.imageio.plugins.bmp;
 import com.twelvemonkeys.imageio.stream.SubImageOutputStream;
 import com.twelvemonkeys.imageio.util.ProgressListenerBase;
-import javax.imageio.IIOException;
+import javax.imageio.*;
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.event.IIOWriteWarningListener;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.spi.ImageWriterSpi;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.RenderedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
@@ -68,7 +64,7 @@ public final class ICOImageWriter extends DIBImageWriter {
    private ImageWriter pngDelegate;
-    ICOImageWriter(final ImageWriterSpi provider) {
+    protected ICOImageWriter(final ImageWriterSpi provider) {
        super(provider);
    }
@@ -128,7 +124,7 @@ public final class ICOImageWriter extends DIBImageWriter {
    }
    @Override
-    public void endWriteSequence() {
+    public void endWriteSequence() throws IOException {
        assertOutput();
        if (sequenceIndex < 0) {
@@ -30,14 +30,24 @@
 package com.twelvemonkeys.imageio.plugins.bmp;
-import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
+import static org.junit.Assert.*;
-import com.twelvemonkeys.xml.XMLSerializer;
+import static org.junit.Assume.assumeNoException;
 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;
-import org.junit.Ignore;
+import java.awt.*;
-import org.junit.Test;
+import java.awt.image.BufferedImage;
-import org.mockito.InOrder;
+import java.io.ByteArrayOutputStream;
-import org.w3c.dom.Node;
+import java.io.IOException;
-import org.w3c.dom.NodeList;
+import java.lang.reflect.Constructor;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
@@ -47,25 +57,16 @@ import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.event.IIOReadProgressListener;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataNode;
 import javax.imageio.spi.IIORegistry;
 import javax.imageio.spi.ImageReaderSpi;
 import java.awt.*;
 import java.awt.image.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import static org.junit.Assert.*;
+import org.junit.Ignore;
-import static org.junit.Assume.assumeNoException;
+import org.junit.Test;
-import static org.mockito.ArgumentMatchers.anyFloat;
+import org.mockito.InOrder;
-import static org.mockito.ArgumentMatchers.eq;
+import org.w3c.dom.Node;
-import static org.mockito.Mockito.atLeastOnce;
+import org.w3c.dom.NodeList;
-import static org.mockito.Mockito.inOrder;
+
-import static org.mockito.Mockito.mock;
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
 import com.twelvemonkeys.xml.XMLSerializer;
 /**
 * BMPImageReaderTest
@@ -294,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);
    }
@@ -317,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);
    }
@@ -325,8 +326,10 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader>
    public void testMetadataEqualsJRE() throws IOException {
        ImageReader jreReader;
        try {
-            ImageReaderSpi provider = (ImageReaderSpi) IIORegistry.getDefaultInstance().getServiceProviderByClass(Class.forName("com.sun.imageio.plugins.bmp.BMPImageReaderSpi"));
+            @SuppressWarnings("unchecked")
-            jreReader = provider.createReaderInstance();
+            Class<ImageReader> jreReaderClass = (Class<ImageReader>) Class.forName("com.sun.imageio.plugins.bmp.BMPImageReader");
            Constructor<ImageReader> constructor = jreReaderClass.getConstructor(ImageReaderSpi.class);
            jreReader = constructor.newInstance(new Object[] {null});
        }
        catch (Exception e) {
            e.printStackTrace();
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-clippath</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Photoshop Path Support</name>
@@ -32,13 +32,4 @@
            <artifactId>imageio-metadata</artifactId>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
 </project>
@@ -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;
@@ -42,7 +42,6 @@ import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
 import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
 import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
 import com.twelvemonkeys.imageio.stream.SubImageInputStream;
 import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
 import javax.imageio.*;
 import javax.imageio.metadata.IIOMetadata;
@@ -308,7 +307,7 @@ public final class Paths {
            throw new IllegalArgumentException("output == null!");
        }
-        ImageTypeSpecifier type = ImageTypeSpecifiers.createFromRenderedImage(image);
+        ImageTypeSpecifier type = ImageTypeSpecifier.createFromRenderedImage(image);
        Iterator<ImageWriter> writers = ImageIO.getImageWriters(type, formatName);
        if (writers.hasNext()) {
@@ -4,13 +4,10 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>imageio-core</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Core</name>
    <description>
        TwelveMonkeys ImageIO core support classes.
    </description>
    <properties>
        <project.jpms.module.name>com.twelvemonkeys.imageio.core</project.jpms.module.name>
@@ -31,20 +28,4 @@
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
                <configuration>
                    <instructions>
                        <Provide-Capability>
                            osgi.serviceloader;
                            osgi.serviceloader=javax.imageio.spi.ImageInputStreamSpi
                        </Provide-Capability>
                    </instructions>
                </configuration>
            </plugin>
        </plugins>
    </build>
 </project>
@@ -1,627 +0,0 @@
 package com.twelvemonkeys.imageio;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataNode;
 import java.awt.*;
 import java.awt.color.*;
 import java.awt.image.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import static com.twelvemonkeys.imageio.StandardImageMetadataSupport.ColorSpaceType.*;
 import static com.twelvemonkeys.lang.Validate.isTrue;
 import static com.twelvemonkeys.lang.Validate.notNull;
 /**
 * Base class for easy read-only implementation of the standard image metadata format.
 * Chroma, Data and Transparency nodes values are based on the required
 * {@link ImageTypeSpecifier}.
 * Other values or overrides may be specified using the builder.
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 */
 public class StandardImageMetadataSupport extends AbstractMetadata {
    // The only required field, most standard metadata can be extracted from the type
    private final ImageTypeSpecifier type;
    protected final ColorSpaceType colorSpaceType;
    protected final boolean blackIsZero;
    private final IndexColorModel palette;
    protected final String compressionName;
    protected final boolean compressionLossless;
    protected final PlanarConfiguration planarConfiguration;
    private final int[] bitsPerSample;
    private final int[] significantBits;
    private final int[] sampleMSB;
    protected final Double pixelAspectRatio;
    protected final ImageOrientation orientation;
    protected final String formatVersion;
    protected final SubimageInterpretation subimageInterpretation;
    private final Calendar documentCreationTime; // TODO: This field should be a LocalDateTime or other java.time type, Consider a long timestamp + TimeZone to avoid messing up the API...
    private final Collection<TextEntry> textEntries;
    protected StandardImageMetadataSupport(Builder builder) {
        notNull(builder, "builder");
        // Baseline
        type = builder.type;
        // Chroma
        colorSpaceType = builder.colorSpaceType;
        blackIsZero = builder.blackIsZero;
        palette = builder.palette;
        // Compression
        compressionName = builder.compressionName;
        compressionLossless = builder.compressionLossless;
        // Data
        planarConfiguration = builder.planarConfiguration;
        bitsPerSample = builder.bitsPerSample;
        significantBits = builder.significantBits;
        sampleMSB = builder.sampleMSB;
        // Dimension
        orientation = builder.orientation;
        pixelAspectRatio = builder.pixelAspectRatio;
        // Document
        formatVersion = builder.formatVersion;
        documentCreationTime = builder.documentCreationTime;
        subimageInterpretation = builder.subimageInterpretation;
        // Text
        textEntries = builder.textEntries;
    }
    public static Builder builder(ImageTypeSpecifier type) {
        return new Builder(type);
    }
    public static class Builder {
        private final ImageTypeSpecifier type;
        private ColorSpaceType colorSpaceType;
        private boolean blackIsZero = true;
        private IndexColorModel palette;
        private String compressionName;
        private boolean compressionLossless = true;
        private PlanarConfiguration planarConfiguration;
        public int[] bitsPerSample;
        private int[] significantBits;
        private int[] sampleMSB;
        private Double pixelAspectRatio;
        private ImageOrientation orientation = ImageOrientation.Normal;
        private String formatVersion;
        private SubimageInterpretation subimageInterpretation;
        private Calendar documentCreationTime; // TODO: This field should be a LocalDateTime or other java.time type
        private final Collection<TextEntry> textEntries = new ArrayList<>();
        protected Builder(ImageTypeSpecifier type) {
            this.type = notNull(type, "type");
        }
        public Builder withColorSpaceType(ColorSpaceType colorSpaceType) {
            this.colorSpaceType = colorSpaceType;
            return this;
        }
        public Builder withBlackIsZero(boolean blackIsZero) {
            this.blackIsZero = blackIsZero;
            return this;
        }
        public Builder withPalette(IndexColorModel palette) {
            this.palette = palette;
            return this;
        }
        public Builder withCompressionTypeName(String compressionName) {
            this.compressionName = notNull(compressionName, "compressionName").equalsIgnoreCase("none") ? null : compressionName;
            return this;
        }
        public Builder withCompressionLossless(boolean lossless) {
            this.compressionLossless = isTrue(lossless || compressionName != null, lossless, "Lossy compression requires compression name");
            return this;
        }
        public Builder withPlanarConfiguration(PlanarConfiguration planarConfiguration) {
            this.planarConfiguration = planarConfiguration;
            return this;
        }
        public Builder withBitsPerSample(int... bitsPerSample) {
            this.bitsPerSample = bitsPerSample;
            return this;
        }
        public Builder withSignificantBitsPerSample(int... significantBits) {
            this.significantBits = isTrue(significantBits.length == 1 || significantBits.length == type.getNumBands(),
                                          significantBits,
                                          String.format("single value or %d values expected", type.getNumBands()));
            return this;
        }
        public Builder withSampleMSB(int... sampleMSB) {
            this.sampleMSB = isTrue(sampleMSB.length == 1 || sampleMSB.length == type.getNumBands(),
                                          sampleMSB,
                                          String.format("single value or %d values expected", type.getNumBands()));
            return this;
        }
        public Builder withPixelAspectRatio(Double pixelAspectRatio) {
            this.pixelAspectRatio = pixelAspectRatio;
            return this;
        }
        public Builder withOrientation(ImageOrientation orientation) {
            this.orientation = notNull(orientation, "orientation");
            return this;
        }
        public Builder withFormatVersion(String formatVersion) {
            this.formatVersion = notNull(formatVersion, "formatVersion");
            return this;
        }
        public Builder withSubimageInterpretation(SubimageInterpretation interpretation) {
            this.subimageInterpretation = interpretation;
            return this;
        }
        public Builder withDocumentCreationTime(Calendar creationTime) {
            this.documentCreationTime = creationTime;
            return this;
        }
        public Builder withTextEntries(Map<String, String> entries) {
            return withTextEntries(toTextEntries(notNull(entries, "entries").entrySet()));
        }
        private Collection<TextEntry> toTextEntries(Collection<Map.Entry<String, String>> entries) {
            TextEntry[] result = new TextEntry[entries.size()];
            int i = 0;
            for (Map.Entry<String, String> entry : entries) {
                result[i++] = new TextEntry(entry.getKey(), entry.getValue());
            }
            return Arrays.asList(result);
        }
        public Builder withTextEntries(Collection<TextEntry> entries) {
            this.textEntries.addAll(notNull(entries, "entries"));
            return this;
        }
        public Builder withTextEntry(String keyword, String value) {
            if (value != null && !value.isEmpty()) {
                this.textEntries.add(new TextEntry(notNull(keyword, "keyword"), value));
            }
            return this;
        }
        public IIOMetadata build() {
            return new StandardImageMetadataSupport(this);
        }
    }
    protected enum ColorSpaceType {
        XYZ(3),
        Lab(3),
        Luv(3),
        YCbCr(3),
        Yxy(3),
        YCCK(4),
        PhotoYCC(3),
        RGB(3),
        GRAY(1),
        HSV(3),
        HLS(3),
        CMYK(3),
        CMY(3),
        // Generic types (so much extra work, because Java names can't start with a number, phew...)
        GENERIC_2CLR(2, "2CLR"),
        GENERIC_3CLR(3, "3CLR"),
        GENERIC_4CLR(4, "4CLR"),
        GENERIC_5CLR(5, "5CLR"),
        GENERIC_6CLR(6, "6CLR"),
        GENERIC_7CLR(7, "7CLR"),
        GENERIC_8CLR(8, "8CLR"),
        GENERIC_9CLR(9, "9CLR"),
        GENERIC_ACLR(0xA, "ACLR"),
        GENERIC_BCLR(0xB, "BCLR"),
        GENERIC_CCLR(0xC, "CCLR"),
        GENERIC_DCLR(0xD, "DCLR"),
        GENERIC_ECLR(0xE, "ECLR"),
        GENERIC_FCLR(0xF, "FCLR");
        final int numChannels;
        private final String nameOverride;
        ColorSpaceType(int numChannels) {
            this(numChannels, null);
        }
        ColorSpaceType(int numChannels, String nameOverride) {
            this.numChannels = numChannels;
            this.nameOverride = nameOverride;
        }
        @Override
        public String toString() {
            return nameOverride != null ? nameOverride : super.toString();
        }
    }
    protected enum PlanarConfiguration {
        PixelInterleaved,
        PlaneInterleaved,
        LineInterleaved,
        TileInterleaved
    }
    protected enum ImageOrientation {
        Normal,
        Rotate90,
        Rotate180,
        Rotate270,
        FlipH,
        FlipV,
        FlipHRotate90,
        FlipVRotate90
    }
    protected enum SubimageInterpretation {
        Standalone,
        SinglePage,
        FullResolution,
        ReducedResolution,
        PyramidLayer,
        Preview,
        VolumeSlice,
        ObjectView,
        Panorama,
        AnimationFrame,
        TransparencyMask,
        CompositingLayer,
        SpectralSlice,
        Unknown
    }
    @Override
    protected IIOMetadataNode getStandardChromaNode() {
        IIOMetadataNode chromaNode = new IIOMetadataNode("Chroma");
        ColorModel colorModel = colorSpaceType != null ? null : type.getColorModel();
        ColorSpaceType csType = colorSpaceType != null ? colorSpaceType : colorSpaceType(colorModel.getColorSpace());
        int numComponents = colorSpaceType != null ? colorSpaceType.numChannels : colorModel.getNumComponents();
        IIOMetadataNode colorSpaceTypeNode = new IIOMetadataNode("ColorSpaceType");
        chromaNode.appendChild(colorSpaceTypeNode);
        colorSpaceTypeNode.setAttribute("name", csType.toString());
        IIOMetadataNode numChannelsNode = new IIOMetadataNode("NumChannels");
        numChannelsNode.setAttribute("value", String.valueOf(numComponents));
        chromaNode.appendChild(numChannelsNode);
        IIOMetadataNode blackIsZeroNode = new IIOMetadataNode("BlackIsZero");
        blackIsZeroNode.setAttribute("value", booleanString(blackIsZero));
        chromaNode.appendChild(blackIsZeroNode);
        if (colorModel instanceof IndexColorModel || palette != null) {
            IndexColorModel colorMap = palette != null ? palette : (IndexColorModel) colorModel;
            IIOMetadataNode paletteNode = new IIOMetadataNode("Palette");
            chromaNode.appendChild(paletteNode);
            for (int i = 0; i < colorMap.getMapSize(); i++) {
                IIOMetadataNode paletteEntryNode = new IIOMetadataNode("PaletteEntry");
                paletteNode.appendChild(paletteEntryNode);
                paletteEntryNode.setAttribute("index", Integer.toString(i));
                paletteEntryNode.setAttribute("red", Integer.toString(colorMap.getRed(i)));
                paletteEntryNode.setAttribute("green", Integer.toString(colorMap.getGreen(i)));
                paletteEntryNode.setAttribute("blue", Integer.toString(colorMap.getBlue(i)));
                // Assumption: BITMASK transparency will use single transparent pixel
                if (colorMap.getTransparency() == Transparency.TRANSLUCENT) {
                    paletteEntryNode.setAttribute("alpha", Integer.toString(colorMap.getAlpha(i)));
                }
            }
            if (colorMap.getTransparentPixel() != -1) {
                IIOMetadataNode backgroundIndexNode = new IIOMetadataNode("BackgroundIndex");
                chromaNode.appendChild(backgroundIndexNode);
                backgroundIndexNode.setAttribute("value", Integer.toString(colorMap.getTransparentPixel()));
            }
        }
        // TODO: BackgroundColor?
        return chromaNode;
    }
    private static ColorSpaceType colorSpaceType(ColorSpace colorSpace) {
        switch (colorSpace.getType()) {
            case ColorSpace.TYPE_XYZ:
                return XYZ;
            case ColorSpace.TYPE_Lab:
                return Lab;
            case ColorSpace.TYPE_Luv:
                return Luv;
            case ColorSpace.TYPE_YCbCr:
                return YCbCr;
            case ColorSpace.TYPE_Yxy:
                return Yxy;
                // Note: Can't map to YCCK or PhotoYCC, as there's no corresponding constant in java.awt.ColorSpace
            case ColorSpace.TYPE_RGB:
                return RGB;
            case ColorSpace.TYPE_GRAY:
                return GRAY;
            case ColorSpace.TYPE_HSV:
                return HSV;
            case ColorSpace.TYPE_HLS:
                return HLS;
            case ColorSpace.TYPE_CMYK:
                return CMYK;
            case ColorSpace.TYPE_CMY:
                return CMY;
            default:
                int numComponents = colorSpace.getNumComponents();
                if (numComponents == 1) {
                    return GRAY;
                }
                else if (numComponents < 16) {
                    return ColorSpaceType.valueOf("GENERIC_" + Integer.toHexString(numComponents) + "CLR");
                }
        }
        throw new IllegalArgumentException("Unknown ColorSpace type: " + colorSpace);
    }
    protected static final class TextEntry {
        static final List<String> COMPRESSIONS = Arrays.asList("none", "lzw", "zip", "bzip", "other");
        final String keyword;
        final String value;
        final String language;
        final String encoding;
        final String compression;
        public TextEntry(final String keyword, final String value) {
            this(keyword, value, null, null, null);
        }
        public TextEntry(final String keyword, final String value, final String language, final String encoding, final String compression) {
            this.keyword = keyword;
            this.value = notNull(value, "value");
            this.language = language;
            this.encoding = encoding;
            this.compression = isTrue(compression == null || COMPRESSIONS.contains(compression), compression, String.format("Unknown compression: %s (expected: %s)", compression, COMPRESSIONS));
        }
    }
    @Override
    protected IIOMetadataNode getStandardCompressionNode() {
        if (compressionName == null) {
            return null;
        }
        IIOMetadataNode node = new IIOMetadataNode("Compression");
        IIOMetadataNode compressionTypeName = new IIOMetadataNode("CompressionTypeName");
        compressionTypeName.setAttribute("value", compressionName);
        node.appendChild(compressionTypeName);
        IIOMetadataNode lossless = new IIOMetadataNode("Lossless");
        lossless.setAttribute("value", booleanString(compressionLossless));
        node.appendChild(lossless);
        return node;
    }
    protected static String booleanString(boolean booleanValue) {
        return booleanValue ? "TRUE" : "FALSE";
    }
    @Override
    protected IIOMetadataNode getStandardDataNode() {
        IIOMetadataNode dataNode = new IIOMetadataNode("Data");
        IIOMetadataNode planarConfigurationNode = new IIOMetadataNode("PlanarConfiguration");
        dataNode.appendChild(planarConfigurationNode);
        planarConfigurationNode.setAttribute("value", planarConfiguration != null ? planarConfiguration.toString() :
                                                  (type.getSampleModel() instanceof BandedSampleModel ? "PlaneInterleaved" : "PixelInterleaved"));
        String sampleFormatValue = colorSpaceType == null && type.getColorModel() instanceof IndexColorModel
                                   ? "Index"
                                   : sampleFormat(type.getSampleModel());
        if (sampleFormatValue != null) {
            IIOMetadataNode sampleFormatNode = new IIOMetadataNode("SampleFormat");
            sampleFormatNode.setAttribute("value", sampleFormatValue);
            dataNode.appendChild(sampleFormatNode);
        }
        int[] bitsPerSample = this.bitsPerSample != null ? this.bitsPerSample : type.getSampleModel().getSampleSize();
        IIOMetadataNode bitsPerSampleNode = new IIOMetadataNode("BitsPerSample");
        bitsPerSampleNode.setAttribute("value", createListValue(bitsPerSample.length, bitsPerSample));
        dataNode.appendChild(bitsPerSampleNode);
        if (significantBits != null) {
            String significantBitsValue = createListValue(type.getNumBands(), significantBits);
            if (!significantBitsValue.equals(bitsPerSampleNode.getAttribute("value"))) {
                IIOMetadataNode significantBitsPerSampleNode = new IIOMetadataNode("SignificantBitsPerSample");
                significantBitsPerSampleNode.setAttribute("value", significantBitsValue);
                dataNode.appendChild(significantBitsPerSampleNode);
            }
        }
        if (sampleMSB != null) {
            // TODO: Only if different from default!
            IIOMetadataNode sampleMSBNode = new IIOMetadataNode("SampleMSB");
            sampleMSBNode.setAttribute("value", createListValue(type.getNumBands(), sampleMSB));
            dataNode.appendChild(sampleMSBNode);
        }
        return dataNode;
    }
    private static String createListValue(final int itemCount, final int... values) {
        StringBuilder buffer = new StringBuilder();
        for (int i = 0; i < itemCount; i++) {
            if (buffer.length() > 0) {
                buffer.append(' ');
            }
            buffer.append(values[i % values.length]);
        }
        return buffer.toString();
    }
    private static String sampleFormat(SampleModel sampleModel) {
        switch (sampleModel.getDataType()) {
            case DataBuffer.TYPE_SHORT:
            case DataBuffer.TYPE_INT:
                if (sampleModel instanceof ComponentSampleModel) {
                    return "SignedIntegral";
                }
                // Otherwise fall-through, most likely a *PixelPackedSampleModel
            case DataBuffer.TYPE_BYTE:
            case DataBuffer.TYPE_USHORT:
                return "UnsignedIntegral";
            case DataBuffer.TYPE_FLOAT:
            case DataBuffer.TYPE_DOUBLE:
                return "Real";
            default:
                return null;
        }
    }
    @Override
    protected IIOMetadataNode getStandardDimensionNode() {
        IIOMetadataNode dimensionNode = new IIOMetadataNode("Dimension");
        if (pixelAspectRatio != null) {
            IIOMetadataNode pixelAspectRatioNode = new IIOMetadataNode("PixelAspectRatio");
            pixelAspectRatioNode.setAttribute("value", String.valueOf(pixelAspectRatio));
            dimensionNode.appendChild(pixelAspectRatioNode);
        }
        IIOMetadataNode imageOrientationNode = new IIOMetadataNode("ImageOrientation");
        imageOrientationNode.setAttribute("value", orientation.toString());
        dimensionNode.appendChild(imageOrientationNode);
        return dimensionNode.hasChildNodes() ? dimensionNode : null;
    }
    @Override
    protected IIOMetadataNode getStandardDocumentNode() {
        IIOMetadataNode documentNode = new IIOMetadataNode("Document");
        if (formatVersion != null) {
            IIOMetadataNode formatVersionNode = new IIOMetadataNode("FormatVersion");
            documentNode.appendChild(formatVersionNode);
            formatVersionNode.setAttribute("value", formatVersion);
        }
        if (subimageInterpretation != null) {
            IIOMetadataNode subImageInterpretationNode = new IIOMetadataNode("SubimageInterpretation");
            documentNode.appendChild(subImageInterpretationNode);
            subImageInterpretationNode.setAttribute("value", subimageInterpretation.toString());
        }
        if (documentCreationTime != null) {
            IIOMetadataNode imageCreationTimeNode = new IIOMetadataNode("ImageCreationTime");
            documentNode.appendChild(imageCreationTimeNode);
            imageCreationTimeNode.setAttribute("year", String.valueOf(documentCreationTime.get(Calendar.YEAR)));
            imageCreationTimeNode.setAttribute("month", String.valueOf(documentCreationTime.get(Calendar.MONTH) + 1));
            imageCreationTimeNode.setAttribute("day", String.valueOf(documentCreationTime.get(Calendar.DAY_OF_MONTH)));
            imageCreationTimeNode.setAttribute("hour", String.valueOf(documentCreationTime.get(Calendar.HOUR_OF_DAY)));
            imageCreationTimeNode.setAttribute("minute", String.valueOf(documentCreationTime.get(Calendar.MINUTE)));
            imageCreationTimeNode.setAttribute("second", String.valueOf(documentCreationTime.get(Calendar.SECOND)));
        }
        return documentNode.hasChildNodes() ? documentNode : null;
    }
    @Override
    protected IIOMetadataNode getStandardTextNode() {
        if (textEntries.isEmpty()) {
            return null;
        }
        IIOMetadataNode textNode = new IIOMetadataNode("Text");
        // DocumentName, ImageDescription, Make, Model, PageName, Software, Artist, HostComputer, InkNames, Copyright:
        // /Text/TextEntry@keyword = field name, /Text/TextEntry@value = field value.
        for (TextEntry entry : textEntries) {
            IIOMetadataNode textEntryNode = new IIOMetadataNode("TextEntry");
            textNode.appendChild(textEntryNode);
            if (entry.keyword != null) {
                textEntryNode.setAttribute("keyword", entry.keyword);
            }
            textEntryNode.setAttribute("value", entry.value);
            if (entry.language != null) {
                textEntryNode.setAttribute("language", entry.language);
            }
            if (entry.encoding != null) {
                textEntryNode.setAttribute("encoding", entry.encoding);
            }
            if (entry.compression != null) {
                textEntryNode.setAttribute("compression", entry.compression);
            }
        }
        return textNode;
    }
    @Override
    protected IIOMetadataNode getStandardTransparencyNode() {
        IIOMetadataNode transparencyNode = new IIOMetadataNode("Transparency");
        ColorModel colorModel = type.getColorModel();
        IIOMetadataNode alphaNode = new IIOMetadataNode("Alpha");
        transparencyNode.appendChild(alphaNode);
        alphaNode.setAttribute("value", colorModel.hasAlpha() ? (colorModel.isAlphaPremultiplied() ? "premultiplied" : "nonpremultiplied") : "none");
        if (colorModel instanceof IndexColorModel) {
            IndexColorModel icm = (IndexColorModel) colorModel;
            if (icm.getTransparentPixel() != -1) {
                IIOMetadataNode transparentIndexNode = new IIOMetadataNode("TransparentIndex");
                transparencyNode.appendChild(transparentIndexNode);
                transparentIndexNode.setAttribute("value", Integer.toString(icm.getTransparentPixel()));
            }
        }
        return transparencyNode;
    }
 }
@@ -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 java.util.Properties;
 import static com.twelvemonkeys.imageio.color.ColorProfiles.*;
 /**
 * 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
+        try {
-        ProfileDeferralActivator.activateProfiles();
+            // 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) {
+    private static byte[] getProfileHeaderWithProfileId(final ICC_Profile profile) {
-        if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.sRGB.header)) {
+        // 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,67 +203,103 @@ 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()) {
+                key = profileCleaner.validationAltersProfileHeader()
-                    cache.put(new Key(getProfileHeaderWithProfileId(cs.getProfile())), cs);
+                      ? new Key(getProfileHeaderWithProfileId(cs.getProfile()))
-                }
+                      : key;
                cache.put(key, cs);
            }
            return cs;
        }
    }
-    private static ICC_ColorSpace getCachedCS(Key profileKey) {
+    private static void validateColorSpace(final ICC_ColorSpace cs) {
        synchronized (cache) {
            return cache.get(profileKey);
        }
    }
    static ICC_ColorSpace getCachedCS(final byte[] profileHeader) {
        return getCachedCS(new Key(profileHeader));
    }
    static void validateColorSpace(final ICC_ColorSpace cs) {
        // Validate the color space, to avoid caching bad profiles/color spaces
        // Will throw IllegalArgumentException or CMMException if the profile is bad
        cs.fromRGB(new float[] {0.999f, 0.5f, 0.001f});
-        // This breaks *sometimes* after validation of bad profiles,
+        // This breaks *some times* after validation of bad profiles,
        // we'll let it blow up early in this case
        cs.getProfile().getData();
    }
    /**
-     * @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
+    static boolean isOffendingColorProfile(final ICC_Profile profile) {
-    public static boolean isCS_GRAY(final ICC_Profile profile) {
+        Validate.notNull(profile, "profile");
-        return ColorProfiles.isCS_GRAY(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);
        }
    }
 }
@@ -54,8 +54,8 @@ public final class DiscreteAlphaIndexColorModel extends ColorModel {
    // Our IndexColorModel delegate
    private final IndexColorModel icm;
    private final int extraSamples;
    private final int samples;
    private final boolean hasAlpha;
    /**
     * Creates a {@code DiscreteAlphaIndexColorModel}, delegating color map look-ups
@@ -86,33 +86,33 @@ public final class DiscreteAlphaIndexColorModel extends ColorModel {
        );
        this.icm = icm;
        this.extraSamples = extraSamples;
        this.samples = 1 + extraSamples;
        this.hasAlpha = hasAlpha;
    }
    @Override
    public int getNumComponents() {
-        return getNumColorComponents() + extraSamples;
+        return samples;
    }
    @Override
-    public int getRed(final int pixel) {
+    public final int getRed(final int pixel) {
        return icm.getRed(pixel);
    }
    @Override
-    public int getGreen(final int pixel) {
+    public final int getGreen(final int pixel) {
        return icm.getGreen(pixel);
    }
    @Override
-    public int getBlue(final int pixel) {
+    public final int getBlue(final int pixel) {
        return icm.getBlue(pixel);
    }
    @Override
-    public int getAlpha(final int pixel) {
+    public final int getAlpha(final int pixel) {
-        return hasAlpha() ? (int) ((((float) pixel) / ((1 << getComponentSize(3)) - 1)) * 255.0f + 0.5f) : 0xff;
+        return hasAlpha ? (int) ((((float) pixel) / ((1 << getComponentSize(3))-1)) * 255.0f + 0.5f) : 0xff;
    }
    private int getSample(final Object inData, final int index) {
@@ -120,15 +120,15 @@ public final class DiscreteAlphaIndexColorModel extends ColorModel {
        switch (transferType) {
            case DataBuffer.TYPE_BYTE:
-                byte[] bdata = (byte[]) inData;
+                byte bdata[] = (byte[]) inData;
                pixel = bdata[index] & 0xff;
                break;
            case DataBuffer.TYPE_USHORT:
-                short[] sdata = (short[]) inData;
+                short sdata[] = (short[]) inData;
                pixel = sdata[index] & 0xffff;
                break;
            case DataBuffer.TYPE_INT:
-                int[] idata = (int[]) inData;
+                int idata[] = (int[]) inData;
                pixel = idata[index];
                break;
            default:
@@ -139,27 +139,27 @@ public final class DiscreteAlphaIndexColorModel extends ColorModel {
    }
    @Override
-    public int getRed(final Object inData) {
+    public final int getRed(final Object inData) {
        return getRed(getSample(inData, 0));
    }
    @Override
-    public int getGreen(final Object inData) {
+    public final int getGreen(final Object inData) {
        return getGreen(getSample(inData, 0));
    }
    @Override
-    public int getBlue(final Object inData) {
+    public final int getBlue(final Object inData) {
        return getBlue(getSample(inData, 0));
    }
    @Override
-    public int getAlpha(final Object inData) {
+    public final int getAlpha(final Object inData) {
-        return hasAlpha() ? getAlpha(getSample(inData, 1)) : 0xff;
+        return hasAlpha ? getAlpha(getSample(inData, 1)) : 0xff;
    }
    @Override
-    public SampleModel createCompatibleSampleModel(final int w, final int h) {
+    public final SampleModel createCompatibleSampleModel(final int w, final int h) {
        return new PixelInterleavedSampleModel(transferType, w, h, samples, w * samples, createOffsets(samples));
    }
@@ -174,17 +174,17 @@ public final class DiscreteAlphaIndexColorModel extends ColorModel {
    }
    @Override
-    public boolean isCompatibleSampleModel(final SampleModel sm) {
+    public final boolean isCompatibleSampleModel(final SampleModel sm) {
        return sm instanceof PixelInterleavedSampleModel && sm.getNumBands() == samples;
    }
    @Override
-    public WritableRaster createCompatibleWritableRaster(final int w, final int h) {
+    public final WritableRaster createCompatibleWritableRaster(final int w, final int h) {
        return Raster.createWritableRaster(createCompatibleSampleModel(w, h), new Point(0, 0));
    }
    @Override
-    public boolean isCompatibleRaster(final Raster raster) {
+    public final boolean isCompatibleRaster(final Raster raster) {
        int size = raster.getSampleModel().getSampleSize(0);
        return ((raster.getTransferType() == transferType) &&
                (raster.getNumBands() == samples) && ((1 << size) >= icm.getMapSize()));
@@ -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();
        }
    }
 }
@@ -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[] Cr_R_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cb_B_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[] Cr_G_LUT = new int[MAXJSAMPLE + 1];
+    private final static int[] Cb_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.
+     * Initializes tables for YCC->RGB color space conversion.
-         */
+     */
-        private static void buildYCCtoRGBtable() {
+    private static void buildYCCtoRGBtable() {
-            if (ColorSpaces.DEBUG) {
+        if (ColorSpaces.DEBUG) {
-                System.err.println("Building JPEG YCbCr conversion table");
+            System.err.println("Building YCC conversion table");
            }
            for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
                // i is the actual input pixel value, in the range 0..MAXJSAMPLE
                // The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE
                // Cr=>R value is nearest int to 1.40200 * x
                Cr_R_LUT[i] = (int) ((1.40200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
                // Cb=>B value is nearest int to 1.77200 * x
                Cb_B_LUT[i] = (int) ((1.77200 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
                // Cr=>G value is scaled-up -0.71414 * x
                Cr_G_LUT[i] = -(int) (0.71414 * (1 << SCALEBITS) + 0.5) * x;
                // Cb=>G value is scaled-up -0.34414 * x
                // We also add in ONE_HALF so that need not do it in inner loop
                Cb_G_LUT[i] = -(int) ((0.34414) * (1 << SCALEBITS) + 0.5) * x + ONE_HALF;
            }
        }
-        static {
+        for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-            buildYCCtoRGBtable();
+            // 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 {
+    static {
-        private final static int[] Cr_R_LUT = new int[MAXJSAMPLE + 1];
+        buildYCCtoRGBtable();
        private final static int[] Cb_B_LUT = new int[MAXJSAMPLE + 1];
        private final static int[] Cr_G_LUT = new int[MAXJSAMPLE + 1];
        private final static int[] Cb_G_LUT = new int[MAXJSAMPLE + 1];
        private final static int[] Y_LUT = new int[MAXJSAMPLE + 1];
        /**
         * Initializes tables for YCC->RGB color space conversion.
         */
        private static void buildYCCtoRGBtable() {
            if (ColorSpaces.DEBUG) {
                System.err.println("Building ITU-R REC.601 YCbCr conversion table");
            }
            for (int i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
                // i is the actual input pixel value, in the range 0..MAXJSAMPLE
                // The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE
                // Y'CbCr to RGB conversion, using values from BT.601 specification:
                //   R = 1.16438 * (Y'-16)                      + 1.59603 * (Cr-128)
                //   G = 1.16438 * (Y'-16) - 0.39176 * (Cb-128) - 0.81297 * (Cr-128)
                //   B = 1.16438 * (Y'-16) + 2.01723 * (Cb-128)
                // Cr=>R value is nearest int to 1.59603 * x
                Cr_R_LUT[i] = ((int) (1.59603 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
                // Cb=>B value is nearest int to 2.01723 * x
                Cb_B_LUT[i] = ((int) (2.01723 * (1 << SCALEBITS) + 0.5) * x + ONE_HALF) >> SCALEBITS;
                // Cr=>G value is scaled-up -0.81297 * x
                Cr_G_LUT[i] = -(int) (0.81297 * (1 << SCALEBITS) + 0.5) * x;
                // Cb=>G value is scaled-up -0.39176 * x
                // We also add in ONE_HALF so that need not do it in inner loop
                Cb_G_LUT[i] = -(int) ((0.39176) * (1 << SCALEBITS) + 0.5) * x + ONE_HALF;
                // Y`=>RGB
                Y_LUT[i] = ((int) (1.16438 * (1 << SCALEBITS) + 0.5) * (i - 16) + ONE_HALF) >> SCALEBITS;
            }
        }
        static {
            buildYCCtoRGBtable();
        }
    }
    public static void convertYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final double[] coefficients, double[] referenceBW, final int offset) {
@@ -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) {
+    public static void convertYCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final int offset) {
-        int y  = yCbCr[offset    ] & 0xff;
+        int y = yCbCr[offset] & 0xff;
        int cb = yCbCr[offset + 1] & 0xff;
        int cr = yCbCr[offset + 2] & 0xff;
        int cb = yCbCr[offset + 1] & 0xff;
-        rgb[offset    ] = clamp(y + JPEG.Cr_R_LUT[cr]);
+        rgb[offset] = clamp(y + Cr_R_LUT[cr]);
-        rgb[offset + 1] = clamp(y + (JPEG.Cb_G_LUT[cb] + JPEG.Cr_G_LUT[cr] >> SCALEBITS));
+        rgb[offset + 1] = clamp(y + (Cb_G_LUT[cb] + Cr_G_LUT[cr] >> SCALEBITS));
-        rgb[offset + 2] = clamp(y + JPEG.Cb_B_LUT[cb]);
+        rgb[offset + 2] = clamp(y + Cb_B_LUT[cb]);
    }
-    public static void convertRec601YCbCr2RGB(final byte[] yCbCr, final byte[] rgb, final int offset) {
+    private static byte clamp(int val) {
        int y =  yCbCr[offset    ] & 0xff;
        int cb = yCbCr[offset + 1] & 0xff;
        int cr = yCbCr[offset + 2] & 0xff;
        rgb[offset    ] = clamp(ITU_R_601.Y_LUT[y] + ITU_R_601.Cr_R_LUT[cr]);
        rgb[offset + 1] = clamp(ITU_R_601.Y_LUT[y] + (ITU_R_601.Cr_G_LUT[cr] + ITU_R_601.Cb_G_LUT[cb] >> SCALEBITS));
        rgb[offset + 2] = clamp(ITU_R_601.Y_LUT[y] + ITU_R_601.Cb_B_LUT[cb]);
    }
    private static byte clamp(final int val) {
        return (byte) Math.max(0, Math.min(255, val));
    }
 }
@@ -1,348 +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.stream;
 import javax.imageio.stream.ImageInputStreamImpl;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import static com.twelvemonkeys.lang.Validate.notNull;
 import static java.lang.Math.max;
 /**
 * A buffered {@link javax.imageio.stream.ImageInputStream} that is backed by a {@link java.nio.channels.SeekableByteChannel}
 * and provides greatly improved performance
 * compared to {@link javax.imageio.stream.FileCacheImageInputStream} or {@link javax.imageio.stream.MemoryCacheImageInputStream}
 * for shorter reads, like single byte or bit reads.
 */
 final class BufferedChannelImageInputStream extends ImageInputStreamImpl {
    private static final Closeable CLOSEABLE_STUB = new Closeable() {
        @Override public void close() {}
    };
    static final int DEFAULT_BUFFER_SIZE = 8192;
    private ByteBuffer byteBuffer = ByteBuffer.allocate(DEFAULT_BUFFER_SIZE);
    private byte[] buffer = byteBuffer.array();
    private int bufferPos;
    private int bufferLimit;
    private final ByteBuffer integralCache = ByteBuffer.allocate(8);
    private final byte[] integralCacheArray = integralCache.array();
    private SeekableByteChannel channel;
    private Closeable closeable;
    /**
     * Constructs a {@code BufferedChannelImageInputStream} that will read from a given {@code File}.
     *
     * @param file a {@code File} to read from.
     * @throws IllegalArgumentException if {@code file} is {@code null}.
     * @throws SecurityException        if a security manager is installed, and it denies read access to the file.
     * @throws IOException              if an I/O error occurs while opening the file.
     */
    public BufferedChannelImageInputStream(final File file) throws IOException {
        this(notNull(file, "file").toPath());
    }
    /**
     * Constructs a {@code BufferedChannelImageInputStream} that will read from a given {@code Path}.
     *
     * @param file a {@code Path} to read from.
     * @throws IllegalArgumentException      if {@code file} is {@code null}.
     * @throws UnsupportedOperationException if the {@code file} is associated with a provider that does not support creating file channels.
     * @throws IOException                   if an I/O error occurs while opening the file.
     * @throws SecurityException             if a security manager is installed, and it denies read access to the file.
     */
    public BufferedChannelImageInputStream(final Path file) throws IOException {
        this(FileChannel.open(notNull(file, "file"), StandardOpenOption.READ), true);
    }
    /**
     * Constructs a {@code BufferedChannelImageInputStream} that will read from a given {@code RandomAccessFile}.
     *
     * @param file a {@code RandomAccessFile} to read from.
     * @throws IllegalArgumentException if {@code file} is {@code null}.
     */
    public BufferedChannelImageInputStream(final RandomAccessFile file) {
        // Closing the RAF is inconsistent, but emulates the behavior of javax.imageio.stream.FileImageInputStream
        this(notNull(file, "file").getChannel(), true);
    }
    /**
     * Constructs a {@code BufferedChannelImageInputStream} that will read from a given {@code FileInputStream}.
     * <p>
     * Closing this stream will <em>not</em> close the {@code FileInputStream}.
     * </p>
     *
     * @param inputStream a {@code FileInputStream} to read from.
     * @throws IllegalArgumentException if {@code inputStream} is {@code null}.
     */
    public BufferedChannelImageInputStream(final FileInputStream inputStream) {
        this(notNull(inputStream, "inputStream").getChannel(), false);
    }
    /**
     * Constructs a {@code BufferedChannelImageInputStream} that will read from a given {@code SeekableByteChannel}.
     * <p>
     * Closing this stream will <em>not</em> close the {@code SeekableByteChannel}.
     * </p>
     *
     * @param channel a {@code SeekableByteChannel} to read from.
     * @throws IllegalArgumentException if {@code channel} is {@code null}.
     */
    public BufferedChannelImageInputStream(final SeekableByteChannel channel) {
        this(notNull(channel, "channel"), false);
    }
    /**
     * Constructs a {@code BufferedChannelImageInputStream} that will read from a given {@code Cache}.
     * <p>
     * Closing this stream will close the {@code Cache}.
     * </p>
     *
     * @param cache a {@code SeekableByteChannel} to read from.
     * @throws IllegalArgumentException if {@code channel} is {@code null}.
     */
    BufferedChannelImageInputStream(final Cache cache) {
        this(notNull(cache, "cache"), true);
    }
    private BufferedChannelImageInputStream(final SeekableByteChannel channel, boolean closeChannelOnClose) {
        this.channel = notNull(channel, "channel");
        this.closeable = closeChannelOnClose ? this.channel : CLOSEABLE_STUB;
    }
    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
    private boolean fillBuffer() throws IOException {
        byteBuffer.rewind();
        int length = channel.read(byteBuffer);
        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;
        ByteBuffer wrapped = ByteBuffer.wrap(bytes, offset, length);
        int read = 0;
        while (wrapped.hasRemaining()) {
            int count = channel.read(wrapped);
            if (count == -1) {
                if (read == 0) {
                    return -1;
                }
                break;
            }
            read += count;
        }
        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 channel.size();
        }
        catch (IOException ignore) {
        }
        return -1;
    }
    public void close() throws IOException {
        super.close();
        buffer = null;
        byteBuffer = null;
        channel = null;
        try {
            closeable.close();
        }
        finally {
            closeable = 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;
            channel.position(position);
        }
        streamPos = position;
    }
    @Override
    public void flushBefore(final long pos) throws IOException {
        super.flushBefore(pos);
        if (channel instanceof Cache) {
            // In case of memory cache, free up memory
            ((Cache) channel).flushBefore(pos);
        }
    }
 }
@@ -49,7 +49,6 @@ import static java.lang.Math.max;
 * {@link File} or {@link RandomAccessFile} can be used as input.
 *
 * @see javax.imageio.stream.FileImageInputStream
 * @deprecated Use {@link BufferedChannelImageInputStream} instead.
 */
 // TODO: Create a memory-mapped version?
 //  Or not... From java.nio.channels.FileChannel.map:
@@ -58,7 +57,6 @@ import static java.lang.Math.max;
 //      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.
@Deprecated
 public final class BufferedFileImageInputStream extends ImageInputStreamImpl {
    static final int DEFAULT_BUFFER_SIZE = 8192;
@@ -192,10 +190,10 @@ public final class BufferedFileImageInputStream extends ImageInputStreamImpl {
    public void close() throws IOException {
        super.close();
        buffer = null;
        raf.close();
        raf = null;
        buffer = null;
    }
    // Need to override the readShort(), readInt() and readLong() methods,
@@ -37,19 +37,18 @@ import javax.imageio.spi.ServiceRegistry;
 import javax.imageio.stream.ImageInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.NoSuchFileException;
 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 final class BufferedFileImageInputStreamSpi extends ImageInputStreamSpi {
+public class BufferedFileImageInputStreamSpi extends ImageInputStreamSpi {
    public BufferedFileImageInputStreamSpi() {
        this(new StreamProviderInfo());
    }
@@ -70,13 +69,12 @@ public final class BufferedFileImageInputStreamSpi extends ImageInputStreamSpi {
        }
    }
-    @Override
+    public ImageInputStream createInputStreamInstance(final Object input, final boolean pUseCache, final File pCacheDir) {
    public ImageInputStream createInputStreamInstance(final Object input, final boolean useCacheFile, final File cacheDir) throws IOException {
        if (input instanceof File) {
            try {
-                return new BufferedChannelImageInputStream((File) input);
+                return new BufferedFileImageInputStream((File) input);
            }
-            catch (FileNotFoundException | NoSuchFileException e) {
+            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,
@@ -93,8 +91,7 @@ public final class BufferedFileImageInputStreamSpi extends ImageInputStreamSpi {
        return false;
    }
-    @Override
+    public String getDescription(final Locale pLocale) {
    public String getDescription(final Locale locale) {
        return "Service provider that instantiates an ImageInputStream from a File";
    }
@@ -1,78 +0,0 @@
 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.IOException;
 import java.io.InputStream;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SeekableByteChannel;
 import java.util.Iterator;
 import java.util.Locale;
 /**
 * BufferedInputStreamImageInputStreamSpi.
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @author last modified by $Author: haraldk$
 * @version $Id: BufferedInputStreamImageInputStreamSpi.java,v 1.0 08/09/2022 haraldk Exp$
 */
 public final class BufferedInputStreamImageInputStreamSpi extends ImageInputStreamSpi {
    public BufferedInputStreamImageInputStreamSpi() {
        this(new StreamProviderInfo());
    }
    private BufferedInputStreamImageInputStreamSpi(ProviderInfo providerInfo) {
        super(providerInfo.getVendorName(), providerInfo.getVersion(), InputStream.class);
    }
    @Override
    public void onRegistration(final ServiceRegistry registry, final Class<?> category) {
        Iterator<ImageInputStreamSpi> providers = registry.getServiceProviders(ImageInputStreamSpi.class, new InputStreamFilter(), true);
        while (providers.hasNext()) {
            ImageInputStreamSpi provider = providers.next();
            if (provider != this) {
                registry.setOrdering(ImageInputStreamSpi.class, this, provider);
            }
        }
    }
    @Override
    public ImageInputStream createInputStreamInstance(final Object input, final boolean useCacheFile, final File cacheDir) throws IOException {
        if (input instanceof InputStream) {
            ReadableByteChannel channel = Channels.newChannel((InputStream) input);
            if (channel instanceof SeekableByteChannel) {
                // Special case for FileInputStream/FileChannel, we can get a seekable channel directly
                return new BufferedChannelImageInputStream((SeekableByteChannel) channel);
            }
            // Otherwise, create a cache for backwards seeking
            return new BufferedChannelImageInputStream(useCacheFile ? new FileCache(channel, cacheDir) : new MemoryCache(channel));
        }
        throw new IllegalArgumentException("Expected input of type InputStream: " + input);
    }
    @Override
    public boolean canUseCacheFile() {
        return true;
    }
    @Override
    public String getDescription(final Locale locale) {
        return "Service provider that instantiates an ImageInputStream from an InputStream";
    }
    private static class InputStreamFilter implements ServiceRegistry.Filter {
        @Override
        public boolean filter(final Object provider) {
            return ((ImageInputStreamSpi) provider).getInputClass() == InputStream.class;
        }
    }
 }
@@ -48,7 +48,7 @@ import java.util.Locale;
 * @author last modified by $Author: haraldk$
 * @version $Id: BufferedRAFImageInputStreamSpi.java,v 1.0 May 15, 2008 2:14:59 PM haraldk Exp$
 */
-public final class BufferedRAFImageInputStreamSpi extends ImageInputStreamSpi {
+public class BufferedRAFImageInputStreamSpi extends ImageInputStreamSpi {
    public BufferedRAFImageInputStreamSpi() {
        this(new StreamProviderInfo());
    }
@@ -69,10 +69,9 @@ public final class BufferedRAFImageInputStreamSpi extends ImageInputStreamSpi {
        }
    }
-    @Override
+    public ImageInputStream createInputStreamInstance(final Object input, final boolean pUseCache, final File pCacheDir) {
    public ImageInputStream createInputStreamInstance(final Object input, final boolean useCacheFile, final File cacheDir) {
        if (input instanceof RandomAccessFile) {
-            return new BufferedChannelImageInputStream((RandomAccessFile) input);
+            return new BufferedFileImageInputStream((RandomAccessFile) input);
        }
        throw new IllegalArgumentException("Expected input of type RandomAccessFile: " + input);
@@ -83,8 +82,7 @@ public final class BufferedRAFImageInputStreamSpi extends ImageInputStreamSpi {
        return false;
    }
-    @Override
+    public String getDescription(final Locale pLocale) {
    public String getDescription(final Locale locale) {
        return "Service provider that instantiates an ImageInputStream from a RandomAccessFile";
    }
@@ -48,18 +48,18 @@ public final class ByteArrayImageInputStream extends ImageInputStreamImpl {
    private final int dataOffset;
    private final int dataLength;
-    public ByteArrayImageInputStream(final byte[] data) {
+    public ByteArrayImageInputStream(final byte[] pData) {
-        this(data, 0, data != null ? data.length : -1);
+        this(pData, 0, pData != null ? pData.length : -1);
    }
-    public ByteArrayImageInputStream(final byte[] data, int offset, int length) {
+    public ByteArrayImageInputStream(final byte[] pData, int offset, int length) {
-        this.data = notNull(data, "data");
+        data = notNull(pData, "data");
-        dataOffset = isMax(data.length, offset, "offset");
+        dataOffset = isBetween(0, pData.length, offset, "offset");
-        dataLength = isMax(data.length - offset, length, "length");
+        dataLength = isBetween(0, pData.length - offset, length, "length");
    }
-    private static int isMax(final int high, final int value, final String name) {
+    private static int isBetween(final int low, final int high, final int value, final String name) {
-        return isTrue(value >= 0 && value <= high, value, String.format("%s out of range [0, %d]: %d", name, high, value));
+        return isTrue(value >= low && value <= high, value, String.format("%s out of range [%d, %d]: %d", name, low, high, value));
    }
    public int read() throws IOException {
@@ -72,14 +72,14 @@ public final class ByteArrayImageInputStream extends ImageInputStreamImpl {
        return data[((int) streamPos++) + dataOffset] & 0xff;
    }
-    public int read(byte[] buffer, int offset, int len) throws IOException {
+    public int read(byte[] pBuffer, int pOffset, int pLength) throws IOException {
        if (streamPos >= dataLength) {
            return -1;
        }
-        int length = (int) Math.min(dataLength - streamPos, len);
+        int length = (int) Math.min(this.dataLength - streamPos, pLength);
        bitOffset = 0;
-        System.arraycopy(data, (int) streamPos + dataOffset, buffer, offset, length);
+        System.arraycopy(data, (int) streamPos + dataOffset, pBuffer, pOffset, length);
        streamPos += length;
        return length;
@@ -45,7 +45,7 @@ import java.util.Locale;
 * @author last modified by $Author: haraldk$
 * @version $Id: ByteArrayImageInputStreamSpi.java,v 1.0 May 15, 2008 2:12:12 PM haraldk Exp$
 */
-public final class ByteArrayImageInputStreamSpi extends ImageInputStreamSpi {
+public class ByteArrayImageInputStreamSpi extends ImageInputStreamSpi {
    public ByteArrayImageInputStreamSpi() {
        this(new StreamProviderInfo());
@@ -55,17 +55,16 @@ public final class ByteArrayImageInputStreamSpi extends ImageInputStreamSpi {
        super(providerInfo.getVendorName(), providerInfo.getVersion(), byte[].class);
    }
-    @Override
+    public ImageInputStream createInputStreamInstance(Object pInput, boolean pUseCache, File pCacheDir) {
-    public ImageInputStream createInputStreamInstance(Object input, boolean useCacheFile, File cacheDir) {
+        if (pInput instanceof byte[]) {
-        if (input instanceof byte[]) {
+            return new ByteArrayImageInputStream((byte[]) pInput);
-            return new ByteArrayImageInputStream((byte[]) input);
+        }
        else {
            throw new IllegalArgumentException("Expected input of type byte[]: " + pInput);
        }
        throw new IllegalArgumentException("Expected input of type byte[]: " + input);
    }
-    @Override
+    public String getDescription(Locale pLocale) {
    public String getDescription(Locale locale) {
        return "Service provider that instantiates an ImageInputStream from a byte array";
    }
@@ -1,7 +0,0 @@
 package com.twelvemonkeys.imageio.stream;
 import java.nio.channels.SeekableByteChannel;
 interface Cache extends SeekableByteChannel {
    void flushBefore(long pos);
 }
@@ -1,133 +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.stream;
 import javax.imageio.stream.ImageInputStreamImpl;
 import java.io.IOException;
 import java.io.InputStream;
 import static com.twelvemonkeys.lang.Validate.isTrue;
 import static com.twelvemonkeys.lang.Validate.notNull;
 /**
 * An {@code ImageInputStream} that adapts an {@code InputSteam},
 * by reading directly from the stream without and form of caching or buffering.
 * <p>
 * Note: This is <em>not</em> a general-purpose {@code ImageInputStream}, and is designed for reading large chunks,
 * typically of pixel data, from an {@code InputStream}.
 * It does <em>not</em> support backwards seeking, or reading bits.
 * </p>
 */
 public final class DirectImageInputStream extends ImageInputStreamImpl {
    private final InputStream stream;
    private final long length;
    public DirectImageInputStream(final InputStream stream) {
        this(stream, -1L);
    }
    public DirectImageInputStream(final InputStream stream, long length) {
        this.stream = notNull(stream, "stream");
        this.length = isTrue(length >= 0L || length == -1L, length, "negative length: %d");
    }
    @Override
    public int read() throws IOException {
        bitOffset = 0;
        streamPos++;
        return stream.read();
    }
    @Override
    public int read(final byte[] bytes, int off, int len) throws IOException {
        bitOffset = 0;
        int read = stream.read(bytes, off, len);
        if (read > 0) {
            streamPos += read;
        }
        return read;
    }
    @Override
    public void seek(long pos) throws IOException {
        checkClosed();
        if (pos < streamPos) {
            // Handle as if flushedPos == streamPos at any time
            throw new IndexOutOfBoundsException("pos < flushedPos");
        }
        bitOffset = 0;
        while (streamPos < pos) {
            long skipped = stream.skip(pos - streamPos);
            if (skipped <= 0) {
                break;
            }
            streamPos += skipped;
        }
    }
    @Override
    public long getFlushedPosition() {
        // Handle as if flushedPos == streamPos at any time
        return streamPos;
    }
    @Override
    public long length() {
        return length;
    }
    @SuppressWarnings("RedundantThrows")
    @Override
    public int readBit() throws IOException {
        throw new UnsupportedOperationException("Bit reading not supported");
    }
    @SuppressWarnings("RedundantThrows")
    @Override
    public long readBits(int numBits) throws IOException {
        throw new UnsupportedOperationException("Bit reading not supported");
    }
    @Override
    public void close() throws IOException {
        // We could seek to EOF here, but the usual case is we know where the next chunk of data is
        stream.close();
        super.close();
    }
 }
@@ -1,112 +0,0 @@
 package com.twelvemonkeys.imageio.stream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.NonWritableChannelException;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import static com.twelvemonkeys.lang.Validate.isTrue;
 import static com.twelvemonkeys.lang.Validate.notNull;
 import static java.lang.Math.max;
 import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE;
 import static java.nio.file.StandardOpenOption.READ;
 import static java.nio.file.StandardOpenOption.WRITE;
 // Note: We could consider creating a memory-mapped version...
 // But, 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.
 final class FileCache implements Cache {
    final static int BLOCK_SIZE = 1 << 13;
    private final FileChannel cache;
    private final ReadableByteChannel channel;
    // TODO: Perhaps skip this constructor?
    FileCache(InputStream stream, File cacheDir) throws IOException {
        // Stream will be closed with channel, documented behavior
        this(Channels.newChannel(notNull(stream, "stream")), cacheDir);
    }
    public FileCache(ReadableByteChannel channel, File cacheDir) throws IOException {
        this.channel = notNull(channel, "channel");
        isTrue(cacheDir == null || cacheDir.isDirectory(), cacheDir, "%s is not a directory");
        // Create a temp file to hold our cache,
        // will be deleted when this channel is closed, as we close the cache
        Path cacheFile = cacheDir == null
                         ? Files.createTempFile("imageio", ".tmp")
                         : Files.createTempFile(cacheDir.toPath(), "imageio", ".tmp");
        cache = FileChannel.open(cacheFile, DELETE_ON_CLOSE, READ, WRITE);
    }
    @SuppressWarnings("StatementWithEmptyBody")
    void fetch() throws IOException {
        while (cache.position() >= cache.size() && cache.transferFrom(channel, cache.size(), max(cache.position() - cache.size(), BLOCK_SIZE)) > 0) {
            // Continue transfer...
        }
    }
    @Override
    public boolean isOpen() {
        return channel.isOpen();
    }
    @Override
    public void close() throws IOException {
        cache.close();
    }
    @Override
    public int read(ByteBuffer dest) throws IOException {
        fetch();
        if (cache.position() >= cache.size()) {
            return -1;
        }
        return cache.read(dest);
    }
    @Override
    public long position() throws IOException {
        return cache.position();
    }
    @Override
    public SeekableByteChannel position(long newPosition) throws IOException {
        cache.position(newPosition);
        return this;
    }
    @Override
    public long size() {
        // We could allow the size to grow, but that means the stream cannot rely on this size, so we'll just pretend we don't know...
        return -1;
    }
    @Override
    public int write(ByteBuffer src) {
        throw new NonWritableChannelException();
    }
    @Override
    public SeekableByteChannel truncate(long size) {
        throw new NonWritableChannelException();
    }
    @Override public void flushBefore(long pos) {
    }
 }
@@ -1,165 +0,0 @@
 package com.twelvemonkeys.imageio.stream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.NonWritableChannelException;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SeekableByteChannel;
 import java.util.ArrayList;
 import java.util.List;
 import static com.twelvemonkeys.lang.Validate.notNull;
 import static java.lang.Math.min;
 final class MemoryCache implements Cache {
    final static int BLOCK_SIZE = 1 << 13;
    private static final byte[] NULL_BLOCK = new byte[0];
    private final List<byte[]> cache = new ArrayList<>();
    private final ReadableByteChannel channel;
    private int maxBlock = Integer.MAX_VALUE;
    private long length;
    private long position;
    private long start;
    // TODO: Maybe get rid of this constructor, as we don't want to do this if we have a FileInputStream/FileChannel...
    MemoryCache(InputStream stream) {
        this(Channels.newChannel(notNull(stream, "stream")));
    }
    public MemoryCache(ReadableByteChannel channel) {
        this.channel = notNull(channel, "channel");
    }
    byte[] fetchBlock() throws IOException {
        long currPos = position;
        long index = currPos / BLOCK_SIZE;
        if (index >= Integer.MAX_VALUE) {
            throw new IOException("Memory cache max size exceeded");
        }
        if (index > maxBlock) {
            return NULL_BLOCK;
        }
        while (index >= cache.size()) {
            byte[] block;
            try {
                block = new byte[BLOCK_SIZE];
            }
            catch (OutOfMemoryError e) {
                throw new IOException("No more memory for cache: " + cache.size() * BLOCK_SIZE);
            }
            cache.add(block);
            int bytesRead = readBlock(block);
            length += bytesRead;
            if (bytesRead < BLOCK_SIZE) {
                // Last block, EOF found
                maxBlock = (int) index;
                return block;
            }
        }
        return cache.get((int) index);
    }
    private int readBlock(final byte[] block) throws IOException {
        ByteBuffer wrapped = ByteBuffer.wrap(block);
        while (wrapped.hasRemaining()) {
            int count = channel.read(wrapped);
            if (count == -1) {
                // Last block, EOF found
                break;
            }
        }
        return wrapped.position();
    }
    @Override
    public boolean isOpen() {
        return channel.isOpen();
    }
    @Override
    public void close() throws IOException {
        cache.clear();
    }
    @Override
    public int read(ByteBuffer dest) throws IOException {
        byte[] buffer = fetchBlock();
        if (position >= length) {
            return -1;
        }
        int bufferPos = (int) (position % BLOCK_SIZE);
        int len = min(dest.remaining(), (int) min(BLOCK_SIZE - bufferPos, length - position));
        dest.put(buffer, bufferPos, len);
        position += len;
        return len;
    }
    @Override
    public long position() throws IOException {
        return position;
    }
    @Override
    public SeekableByteChannel position(long newPosition) throws IOException {
        if (newPosition < start) {
            throw new IOException("Seek before flush position");
        }
        this.position = newPosition;
        return this;
    }
    @Override
    public long size() throws IOException {
        // We could allow the size to grow, but that means the stream cannot rely on this size, so we'll just pretend we don't know...
        return -1;
    }
    @Override
    public int write(ByteBuffer src) {
        throw new NonWritableChannelException();
    }
    @Override
    public SeekableByteChannel truncate(long size) {
        throw new NonWritableChannelException();
    }
    @Override
    public void flushBefore(long pos) {
        if (pos < start) {
            throw new IndexOutOfBoundsException("pos < flushed position");
        }
        if (pos > position) {
            throw new IndexOutOfBoundsException("pos > current position");
        }
        int blocks = (int) (pos / BLOCK_SIZE); // Overflow guarded for in fetchBlock
        // Clear blocks no longer needed
        for (int i = 0; i < blocks; i++) {
            cache.set(i, null);
        }
        start = pos;
    }
 }
@@ -53,20 +53,20 @@ public final class SubImageInputStream extends ImageInputStreamImpl {
    /**
     * Creates a {@link ImageInputStream}, reading up to a maximum number of bytes from the underlying stream.
     *
-     * @param stream the underlying stream
+     * @param pStream the underlying stream
-     * @param length the maximum length to read from the stream.
+     * @param pLength the maximum length to read from the stream.
-     * Note that {@code stream} may contain less than this maximum number of bytes.
+     * Note that {@code pStream} may contain less than this maximum number of bytes.
     *
-     * @throws IOException if {@code stream}'s position can't be determined.
+     * @throws IOException if {@code pStream}'s position can't be determined.
-     * @throws IllegalArgumentException if {@code stream == null} or {@code length < 0}
+     * @throws IllegalArgumentException if {@code pStream == null} or {@code pLength < 0}
     */
-    public SubImageInputStream(final ImageInputStream stream, final long length) throws IOException {
+    public SubImageInputStream(final ImageInputStream pStream, final long pLength) throws IOException {
-        Validate.notNull(stream, "stream");
+        Validate.notNull(pStream, "stream");
-        Validate.isTrue(length >= 0, length, "length < 0: %d");
+        Validate.isTrue(pLength >= 0, pLength, "length < 0: %d");
-        this.stream = stream;
+        stream = pStream;
-        this.startPos = stream.getStreamPosition();
+        startPos = pStream.getStreamPosition();
-        this.length = length;
+        length = pLength;
    }
    public int read() throws IOException {
@@ -84,14 +84,14 @@ public final class SubImageInputStream extends ImageInputStreamImpl {
        }
    }
-    public int read(final byte[] bytes, final int off, final int len) throws IOException {
+    public int read(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
        if (streamPos >= length) { // Local EOF
            return -1;
        }
-        // Safe cast, as len can never cause int overflow
+        // Safe cast, as pLength can never cause int overflow
-        int length = (int) Math.min(len, this.length - streamPos);
+        int length = (int) Math.min(pLength, this.length - streamPos);
-        int count = stream.read(bytes, off, length);
+        int count = stream.read(pBytes, pOffset, length);
        if (count >= 0) {
            streamPos += count;
@@ -113,18 +113,18 @@ public final class SubImageInputStream extends ImageInputStreamImpl {
    }
    @Override
-    public void seek(final long position) throws IOException {
+    public void seek(final long pPosition) throws IOException {
-        if (position < getFlushedPosition()) {
+        if (pPosition < getFlushedPosition()) {
            throw new IndexOutOfBoundsException("pos < flushedPosition");
        }
-        stream.seek(startPos + position);
+        stream.seek(startPos + pPosition);
-        streamPos = position;
+        streamPos = pPosition;
    }
-    @SuppressWarnings("MethodDoesntCallSuperMethod")
+    @SuppressWarnings({"FinalizeDoesntCallSuperFinalize"})
    @Override
-    protected void finalize() {
+    protected void finalize() throws Throwable {
        // Empty finalizer (for improved performance; no need to call super.finalize() in this case)
    }
 }
@@ -33,7 +33,9 @@ package com.twelvemonkeys.imageio.stream;
 import com.twelvemonkeys.imageio.spi.ProviderInfo;
 import javax.imageio.spi.ImageInputStreamSpi;
 import javax.imageio.stream.FileCacheImageInputStream;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.MemoryCacheImageInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,7 +52,7 @@ import java.util.Locale;
 * @version $Id: URLImageInputStreamSpi.java,v 1.0 May 15, 2008 2:14:59 PM haraldk Exp$
 */
 // TODO: URI instead of URL?
-public final class URLImageInputStreamSpi extends ImageInputStreamSpi {
+public class URLImageInputStreamSpi extends ImageInputStreamSpi {
    public URLImageInputStreamSpi() {
        this(new StreamProviderInfo());
    }
@@ -62,28 +64,53 @@ public final class URLImageInputStreamSpi extends ImageInputStreamSpi {
    // TODO: Create a URI or URLImageInputStream class, with a getUR[I|L] method, to allow for multiple file formats
    // The good thing with that is that it does not clash with the built-in Sun-stuff or other people's hacks
    // The bad thing is that most people don't expect there to be an UR[I|L]ImageInputStreamSpi..
-    @Override
+    public ImageInputStream createInputStreamInstance(final Object pInput, final boolean pUseCache, final File pCacheDir) throws IOException {
-    public ImageInputStream createInputStreamInstance(final Object input, final boolean useCacheFile, final File cacheDir) throws IOException {
+        if (pInput instanceof URL) {
-        if (input instanceof URL) {
+            URL url = (URL) pInput;
            URL url = (URL) input;
            // Special case for file protocol, a lot faster than FileCacheImageInputStream
            if ("file".equals(url.getProtocol())) {
                try {
-                    return new BufferedChannelImageInputStream(new File(url.toURI()));
+                    return new BufferedFileImageInputStream(new File(url.toURI()));
                }
-                catch (URISyntaxException shouldNeverHappen) {
+                catch (URISyntaxException ignore) {
-                    // This should never happen, but if it does, we'll fall back to using the stream
+                    // This should never happen, but if it does, we'll fall back to using the stream  
-                    shouldNeverHappen.printStackTrace();
+                    ignore.printStackTrace();
                }
            }
            // Otherwise revert to cached
-            InputStream urlStream = url.openStream();
+            final InputStream urlStream = url.openStream();
-            return new BufferedChannelImageInputStream(useCacheFile ? new FileCache(urlStream, cacheDir) : new MemoryCache(urlStream));
+            if (pUseCache) {
                return new FileCacheImageInputStream(urlStream, pCacheDir) {
                    @Override
                    public void close() throws IOException {
                        try {
                            super.close();
                        }
                        finally {
                            urlStream.close(); // NOTE: If this line throws IOE, it will shadow the original..
                        }
                    }
                };
            }
            else {
                return new MemoryCacheImageInputStream(urlStream) {
                    @Override
                    public void close() throws IOException {
                        try {
                            super.close();
                        }
                        finally {
                            urlStream.close(); // NOTE: If this line throws IOE, it will shadow the original..
                        }
                    }
                };
            }
        }
        else {
            throw new IllegalArgumentException("Expected input of type URL: " + pInput);
        }
        throw new IllegalArgumentException("Expected input of type URL: " + input);
    }
    @Override
@@ -91,7 +118,7 @@ public final class URLImageInputStreamSpi extends ImageInputStreamSpi {
        return true;
    }
-    public String getDescription(final Locale locale) {
+    public String getDescription(final Locale pLocale) {
        return "Service provider that instantiates an ImageInputStream from a URL";
    }
 }
@@ -81,7 +81,7 @@ class IIOInputStreamAdapter extends InputStream {
    private IIOInputStreamAdapter(ImageInputStream pInput, long pLength, boolean pHasLength) {
        Validate.notNull(pInput, "stream");
-        Validate.isTrue(!pHasLength || pLength >= 0, pLength, "length < 0: %d");
+        Validate.isTrue(!pHasLength || pLength >= 0, pLength, "length < 0: %f");
        input = pInput;
        left = pLength;
@@ -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
+        try {
-        // registry.getServiceProviderByClass(Class.forName(providerClassName))
+            return category.cast(registry.getServiceProviderByClass(Class.forName(providerClassName)));
-        Iterator<T> providers = registry.getServiceProviders(category, true);
+        }
-
+        catch (ClassNotFoundException ignore) {
-        while (providers.hasNext()) {
+            return null;
            T provider = providers.next();
            if (provider.getClass().getName().equals(providerClassName)) {
                return provider;
            }
        }
        return null;
    }
    /**
@@ -30,15 +30,22 @@
 package com.twelvemonkeys.imageio.util;
 import com.twelvemonkeys.imageio.color.DiscreteAlphaIndexColorModel;
 import javax.imageio.ImageTypeSpecifier;
 import java.awt.color.*;
 import java.awt.image.*;
 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 javax.imageio.ImageTypeSpecifier;
 import com.twelvemonkeys.imageio.color.DiscreteAlphaIndexColorModel;
 /**
 * Factory class for creating {@code ImageTypeSpecifier}s.
 * Fixes some subtle bugs in {@code ImageTypeSpecifier}'s factory methods, but
@@ -51,52 +58,28 @@ import static com.twelvemonkeys.lang.Validate.notNull;
 */
 public final class ImageTypeSpecifiers {
    private static final ImageTypeSpecifier TYPE_INT_RGB = createPackedOddBits(ColorSpace.getInstance(ColorSpace.CS_sRGB), 24,
                                                                               0xFF0000,
                                                                               0x00FF00,
                                                                               0x0000FF,
                                                                               0x0,
                                                                               DataBuffer.TYPE_INT,
                                                                               false);
    private static final ImageTypeSpecifier TYPE_INT_BGR = createPackedOddBits(ColorSpace.getInstance(ColorSpace.CS_sRGB), 24,
                                                                               0x0000FF,
                                                                               0x00FF00,
                                                                               0xFF0000,
                                                                               0x0,
                                                                               DataBuffer.TYPE_INT,
                                                                               false);
    private static final ImageTypeSpecifier TYPE_USHORT_565_RGB = createPackedOddBits(ColorSpace.getInstance(ColorSpace.CS_sRGB), 16,
                                                                                      0xF800,
                                                                                      0x07E0,
                                                                                      0x001F,
                                                                                      0x0,
                                                                                      DataBuffer.TYPE_USHORT,
                                                                                      false);
    private static final ImageTypeSpecifier TYPE_USHORT_555_RGB = createPackedOddBits(ColorSpace.getInstance(ColorSpace.CS_sRGB), 15,
                                                                                      0x7C00,
                                                                                      0x03E0,
                                                                                      0x001F,
                                                                                      0x0,
                                                                                      DataBuffer.TYPE_USHORT,
                                                                                      false);
    private ImageTypeSpecifiers() {}
    public static ImageTypeSpecifier createFromBufferedImageType(final int bufferedImageType) {
        switch (bufferedImageType) {
-            // ImageTypeSpecifier unconditionally uses bits == 32, we'll use a workaround for the INT_RGB and USHORT types
+            // ImageTypeSpecifier unconditionally uses bits == 32, we'll use a workaround for the USHORT types
            case BufferedImage.TYPE_INT_RGB:
                return TYPE_INT_RGB;
            case BufferedImage.TYPE_INT_BGR:
                return TYPE_INT_BGR;
            case BufferedImage.TYPE_USHORT_565_RGB:
-                return TYPE_USHORT_565_RGB;
+                return createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
                        0xF800,
                        0x07E0,
                        0x001F,
                        0x0,
                        DataBuffer.TYPE_USHORT,
                        false);
            case BufferedImage.TYPE_USHORT_555_RGB:
-                return TYPE_USHORT_555_RGB;
+                return createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
-
+                        0x7C00,
                        0x03E0,
                        0x001F,
                        0x0,
                        DataBuffer.TYPE_USHORT,
                        false);
            default:
        }
@@ -107,41 +90,23 @@ public final class ImageTypeSpecifiers {
                                                  final int redMask, final int greenMask,
                                                  final int blueMask, final int alphaMask,
                                                  final int transferType, boolean isAlphaPremultiplied) {
-        int bits = calculateRequiredBits(redMask | greenMask | blueMask | alphaMask);
+        if (transferType == DataBuffer.TYPE_BYTE || transferType == DataBuffer.TYPE_USHORT) {
        if (bits != 32) {
            // ImageTypeSpecifier unconditionally uses bits == 32, we'll use a workaround for BYTE/USHORT types
-            return createPackedOddBits(colorSpace, bits, redMask, greenMask, blueMask, alphaMask, transferType, isAlphaPremultiplied);
+            notNull(colorSpace, "colorSpace");
            isTrue(colorSpace.getType() == ColorSpace.TYPE_RGB, colorSpace, "ColorSpace must be TYPE_RGB");
            isTrue(redMask != 0 || greenMask != 0 || blueMask != 0 || alphaMask != 0, "No mask has at least 1 bit set");
            int bits = transferType == DataBuffer.TYPE_BYTE ? 8 : 16;
            ColorModel colorModel = new DirectColorModel(colorSpace, bits, redMask, greenMask, blueMask, alphaMask,
                    isAlphaPremultiplied, transferType);
            return new ImageTypeSpecifier(colorModel, colorModel.createCompatibleSampleModel(1, 1));
        }
        return ImageTypeSpecifier.createPacked(colorSpace, redMask, greenMask, blueMask, alphaMask, transferType, isAlphaPremultiplied);
    }
    private static int calculateRequiredBits(int mask) {
        // See https://graphics.stanford.edu/~seander/bithacks.html#IntegerLogObvious
        int r = 1;
        while ((mask >>>= 1) != 0) {
            r++;
        }
        return r;
    }
    static ImageTypeSpecifier createPackedOddBits(final ColorSpace colorSpace, int bits,
                                                  final int redMask, final int greenMask,
                                                  final int blueMask, final int alphaMask,
                                                  final int transferType, boolean isAlphaPremultiplied) {
        // ImageTypeSpecifier unconditionally uses bits == 32, we'll use a workaround
        notNull(colorSpace, "colorSpace");
        isTrue(colorSpace.getType() == ColorSpace.TYPE_RGB, colorSpace, "ColorSpace must be TYPE_RGB");
        isTrue(redMask != 0 || greenMask != 0 || blueMask != 0 || alphaMask != 0, "No mask has at least 1 bit set");
        ColorModel colorModel = new DirectColorModel(colorSpace, bits, redMask, greenMask, blueMask, alphaMask,
                                                     isAlphaPremultiplied, transferType);
        return new ImageTypeSpecifier(colorModel, colorModel.createCompatibleSampleModel(1, 1));
    }
    public static ImageTypeSpecifier createInterleaved(final ColorSpace colorSpace,
                                                       final int[] bandOffsets,
                                                       final int dataType,
@@ -257,35 +222,17 @@ public final class ImageTypeSpecifiers {
        return createFromIndexColorModel(new IndexColorModel(bits, colors.length, colors, 0, hasAlpha, transIndex, dataType));
    }
-    public static ImageTypeSpecifier createFromIndexColorModel(final IndexColorModel colorModel) {
+    public static ImageTypeSpecifier createFromIndexColorModel(final IndexColorModel pColorModel) {
-        return new IndexedImageTypeSpecifier(colorModel);
+        return new IndexedImageTypeSpecifier(pColorModel);
    }
-    public static ImageTypeSpecifier createDiscreteAlphaIndexedFromIndexColorModel(final IndexColorModel colorModel) {
+    public static ImageTypeSpecifier createDiscreteAlphaIndexedFromIndexColorModel(final IndexColorModel pColorModel) {
-        ColorModel discreteAlphaIndexColorModel = new DiscreteAlphaIndexColorModel(colorModel);
+        ColorModel colorModel = new DiscreteAlphaIndexColorModel(pColorModel);
-        return new ImageTypeSpecifier(discreteAlphaIndexColorModel, discreteAlphaIndexColorModel.createCompatibleSampleModel(1, 1));
+        return new ImageTypeSpecifier(colorModel, colorModel.createCompatibleSampleModel(1, 1));
    }
-    public static ImageTypeSpecifier createDiscreteExtraSamplesIndexedFromIndexColorModel(final IndexColorModel colorModel, int extraSamples, boolean hasAlpha) {
+    public static ImageTypeSpecifier createDiscreteExtraSamplesIndexedFromIndexColorModel(final IndexColorModel pColorModel, int extraSamples, boolean hasAlpha) {
-        ColorModel discreteAlphaIndexColorModel = new DiscreteAlphaIndexColorModel(colorModel, extraSamples, hasAlpha);
+        ColorModel colorModel = new DiscreteAlphaIndexColorModel(pColorModel, extraSamples, hasAlpha);
-        return new ImageTypeSpecifier(discreteAlphaIndexColorModel, discreteAlphaIndexColorModel.createCompatibleSampleModel(1, 1));
+        return new ImageTypeSpecifier(colorModel, colorModel.createCompatibleSampleModel(1, 1));
    }
    public static ImageTypeSpecifier createFromRenderedImage(RenderedImage image) {
        if (image == null) {
            throw new IllegalArgumentException("image == null!");
        }
        if (image instanceof BufferedImage) {
            int bufferedImageType = ((BufferedImage) image).getType();
            if (bufferedImageType != BufferedImage.TYPE_CUSTOM &&
                    // Need to retain the actual palette in the color model for IndexColorModel
                    bufferedImageType != BufferedImage.TYPE_BYTE_BINARY && bufferedImageType != BufferedImage.TYPE_BYTE_INDEXED) {
                return createFromBufferedImageType(bufferedImageType);
            }
        }
        return new ImageTypeSpecifier(image);
    }
 }
@@ -52,12 +52,12 @@ final class IndexedImageTypeSpecifier extends ImageTypeSpecifier {
    }
    @Override
-    public BufferedImage createBufferedImage(final int width, final int height) {
+    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(width, height);
+            WritableRaster raster = colorModel.createCompatibleWritableRaster(pWidth, pHeight);
            return new BufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), null);
        }
        catch (NegativeArraySizeException e) {
@@ -1,5 +1,2 @@
 com.twelvemonkeys.imageio.stream.BufferedFileImageInputStreamSpi
 com.twelvemonkeys.imageio.stream.BufferedRAFImageInputStreamSpi
 com.twelvemonkeys.imageio.stream.BufferedInputStreamImageInputStreamSpi
 # Use SPI loading as a hook for early profile activation
 com.twelvemonkeys.imageio.color.ProfileDeferralActivator$Spi
@@ -1,333 +0,0 @@
 package com.twelvemonkeys.imageio;
 import com.twelvemonkeys.imageio.StandardImageMetadataSupport.ColorSpaceType;
 import com.twelvemonkeys.imageio.StandardImageMetadataSupport.ImageOrientation;
 import com.twelvemonkeys.imageio.StandardImageMetadataSupport.PlanarConfiguration;
 import com.twelvemonkeys.imageio.StandardImageMetadataSupport.SubimageInterpretation;
 import com.twelvemonkeys.imageio.StandardImageMetadataSupport.TextEntry;
 import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
 import org.junit.Test;
 import org.w3c.dom.NodeList;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataNode;
 import java.awt.image.*;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import static com.twelvemonkeys.imageio.StandardImageMetadataSupport.builder;
 import static org.junit.Assert.*;
 public class StandardImageMetadataSupportTest {
    @Test(expected = IllegalArgumentException.class)
    public void createNullBuilder() {
        new StandardImageMetadataSupport(null);
    }
    @Test(expected = IllegalArgumentException.class)
    public void createNullType() {
        new StandardImageMetadataSupport(builder(null));
    }
    @Test(expected = IllegalArgumentException.class)
    public void builderNullType() {
        builder(null).build();
    }
    @Test
    public void createValid() {
        IIOMetadata metadata = new StandardImageMetadataSupport(builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_ARGB)));
        assertNotNull(metadata);
    }
    @Test
    public void builderValid() {
        IIOMetadata metadata = builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_ARGB))
                .build();
        assertNotNull(metadata);
    }
    @Test
    public void compressionValuesUnspecified() {
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .build();
        assertNull(metadata.getStandardCompressionNode());
    }
    @Test
    public void compressionValuesNone() {
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .withCompressionTypeName("nOnE") // Case-insensitive
                .build();
        assertNull(metadata.getStandardCompressionNode());
    }
    @Test
    public void compressionValuesName() {
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .withCompressionTypeName("foo")
                .build();
        IIOMetadataNode compressionNode = metadata.getStandardCompressionNode();
        assertNotNull(compressionNode);
        IIOMetadataNode compressionName = (IIOMetadataNode) compressionNode.getElementsByTagName("CompressionTypeName").item(0);
        assertEquals("foo", compressionName.getAttribute("value"));
        // Defaults to lossless true
        IIOMetadataNode compressionLossless = (IIOMetadataNode) compressionNode.getElementsByTagName("Lossless").item(0);
        assertEquals("TRUE", compressionLossless.getAttribute("value"));
    }
    @Test(expected = IllegalArgumentException.class)
    public void withCompressionLossyIllegal() {
        builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .withCompressionLossless(false);
    }
    @Test
    public void compressionValuesLossy() {
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .withCompressionTypeName("bar")
                .withCompressionLossless(false)
                .build();
        IIOMetadataNode compressionNode = metadata.getStandardCompressionNode();
        assertNotNull(compressionNode);
        IIOMetadataNode compressionName = (IIOMetadataNode) compressionNode.getElementsByTagName("CompressionTypeName").item(0);
        assertEquals("bar", compressionName.getAttribute("value"));
        IIOMetadataNode compressionLossless = (IIOMetadataNode) compressionNode.getElementsByTagName("Lossless").item(0);
        assertEquals("FALSE", compressionLossless.getAttribute("value"));
    }
    @Test
    public void withDocumentValuesDefault() {
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .build();
        IIOMetadataNode documentNode = metadata.getStandardDocumentNode();
        assertNull(documentNode);
    }
    @Test
    public void withDocumentValues() {
        Calendar creationTime = Calendar.getInstance();
        creationTime.set(2022, Calendar.SEPTEMBER, 8, 14, 5, 0);
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .withFormatVersion("42")
                .withDocumentCreationTime(creationTime)
                .build();
        IIOMetadataNode documentNode = metadata.getStandardDocumentNode();
        assertNotNull(documentNode);
        IIOMetadataNode formatVersion = (IIOMetadataNode) documentNode.getElementsByTagName("FormatVersion").item(0);
        assertEquals("42", formatVersion.getAttribute("value"));
        IIOMetadataNode imageCreationTime = (IIOMetadataNode) documentNode.getElementsByTagName("ImageCreationTime").item(0);
        assertEquals("2022", imageCreationTime.getAttribute("year"));
        assertEquals("9", imageCreationTime.getAttribute("month"));
        assertEquals("8", imageCreationTime.getAttribute("day"));
        assertEquals("14", imageCreationTime.getAttribute("hour"));
        assertEquals("5", imageCreationTime.getAttribute("minute"));
        assertEquals("0", imageCreationTime.getAttribute("second"));
    }
    @Test
    public void withTextValuesDefault() {
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .build();
        IIOMetadataNode textNode = metadata.getStandardTextNode();
        assertNull(textNode);
    }
    @Test
    public void withTextValuesSingle() {
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .withTextEntry("foo", "bar")
                .build();
        IIOMetadataNode textNode = metadata.getStandardTextNode();
        assertNotNull(textNode);
        IIOMetadataNode textEntry = (IIOMetadataNode) textNode.getElementsByTagName("TextEntry").item(0);
        assertEquals("foo", textEntry.getAttribute("keyword"));
        assertEquals("bar", textEntry.getAttribute("value"));
    }
    @Test
    public void withTextValuesMap() {
        Map<String, String> entries = new LinkedHashMap<>();
        entries.put("foo", "bar");
        entries.put("bar", "xyzzy");
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .withTextEntries(entries)
                .build();
        IIOMetadataNode textNode = metadata.getStandardTextNode();
        assertNotNull(textNode);
        NodeList textEntries = textNode.getElementsByTagName("TextEntry");
        assertEquals(entries.size(), textEntries.getLength());
        int i = 0;
        for (Entry<String, String> entry : entries.entrySet()) {
            IIOMetadataNode textEntry = (IIOMetadataNode) textEntries.item(i);
            assertEquals(entry.getKey(), textEntry.getAttribute("keyword"));
            assertEquals(entry.getValue(), textEntry.getAttribute("value"));
            i++;
        }
    }
    @Test
    public void withTextValuesList() {
        List<TextEntry> entries = Arrays.asList(
                new TextEntry(null, "foo"), // No key allowed
                new TextEntry("foo", "bar"),
                new TextEntry("bar", "xyzzy"),
                new TextEntry("bar", "nothing happens..."), // Duplicates allowed
                new TextEntry("everything", "válüè", "unknown", "UTF-8", "zip")
        );
        StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                .withTextEntries(entries)
                .build();
        IIOMetadataNode textNode = metadata.getStandardTextNode();
        assertNotNull(textNode);
        NodeList textEntries = textNode.getElementsByTagName("TextEntry");
        assertEquals(entries.size(), textEntries.getLength());
        for (int i = 0; i < entries.size(); i++) {
            TextEntry entry = entries.get(i);
            IIOMetadataNode textEntry = (IIOMetadataNode) textEntries.item(i);
            assertAttributeEqualOrAbsent(entry.keyword, textEntry, "keyword");
            assertEquals(entry.value, textEntry.getAttribute("value"));
            assertAttributeEqualOrAbsent(entry.language, textEntry, "language");
            assertAttributeEqualOrAbsent(entry.encoding, textEntry, "encoding");
            assertAttributeEqualOrAbsent(entry.compression, textEntry, "compression");
        }
    }
    private static void assertAttributeEqualOrAbsent(final String expectedValue, IIOMetadataNode node, final String attribute) {
        if (expectedValue != null) {
            assertEquals(expectedValue, node.getAttribute(attribute));
        }
        else {
            assertFalse(node.hasAttribute(attribute));
        }
    }
    @Test
    public void withPlanarColorspaceType() {
        // See: https://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/doc-files/standard_metadata.html
        Collection<String> allowedValues = Arrays.asList(
                "XYZ", "Lab", "Luv", "YCbCr", "Yxy", "YCCK", "PhotoYCC",
                "RGB", "GRAY", "HSV", "HLS", "CMYK", "CMY",
                "2CLR", "3CLR", "4CLR", "5CLR", "6CLR", "7CLR", "8CLR",
                "9CLR", "ACLR", "BCLR", "CCLR", "DCLR", "ECLR", "FCLR"
        );
        for (ColorSpaceType value : ColorSpaceType.values()) {
            StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                    .withColorSpaceType(value)
                    .build();
            assertNotNull(metadata);
            IIOMetadataNode documentNode = metadata.getStandardChromaNode();
            assertNotNull(documentNode);
            IIOMetadataNode subImageInterpretation = (IIOMetadataNode) documentNode.getElementsByTagName("ColorSpaceType").item(0);
            assertEquals(value.toString(), subImageInterpretation.getAttribute("name")); // Format oddity: Why is this not "value"?
            assertTrue(allowedValues.contains(value.toString()));
        }
    }
    @Test
    public void withPlanarConfiguration() {
        // See: https://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/doc-files/standard_metadata.html
        Collection<String> allowedValues = Arrays.asList("PixelInterleaved", "PlaneInterleaved", "LineInterleaved", "TileInterleaved");
        for (PlanarConfiguration value : PlanarConfiguration.values()) {
            StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_3BYTE_BGR))
                    .withPlanarConfiguration(value)
                    .build();
            assertNotNull(metadata);
            IIOMetadataNode documentNode = metadata.getStandardDataNode();
            assertNotNull(documentNode);
            IIOMetadataNode subImageInterpretation = (IIOMetadataNode) documentNode.getElementsByTagName("PlanarConfiguration").item(0);
            assertEquals(value.toString(), subImageInterpretation.getAttribute("value"));
            assertTrue(allowedValues.contains(value.toString()));
        }
    }
    @Test
    public void withImageOrientation() {
        // See: https://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/doc-files/standard_metadata.html
        Collection<String> allowedValues = Arrays.asList("Normal", "Rotate90", "Rotate180", "Rotate270", "FlipH", "FlipV", "FlipHRotate90", "FlipVRotate90");
        for (ImageOrientation value : ImageOrientation.values()) {
            StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY))
                    .withOrientation(value)
                    .build();
            assertNotNull(metadata);
            IIOMetadataNode documentNode = metadata.getStandardDimensionNode();
            assertNotNull(documentNode);
            IIOMetadataNode subImageInterpretation = (IIOMetadataNode) documentNode.getElementsByTagName("ImageOrientation").item(0);
            assertEquals(value.toString(), subImageInterpretation.getAttribute("value"));
            assertTrue(allowedValues.contains(value.toString()));
        }
    }
    @Test
    public void withSubimageInterpretation() {
        // See: https://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/doc-files/standard_metadata.html
        Collection<String> allowedValues = Arrays.asList(
                "Standalone", "SinglePage", "FullResolution", "ReducedResolution", "PyramidLayer",
                "Preview", "VolumeSlice", "ObjectView", "Panorama", "AnimationFrame",
                "TransparencyMask", "CompositingLayer", "SpectralSlice", "Unknown"
        );
        for (SubimageInterpretation value : SubimageInterpretation.values()) {
            StandardImageMetadataSupport metadata = (StandardImageMetadataSupport) builder(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB))
                    .withSubimageInterpretation(value)
                    .build();
            assertNotNull(metadata);
            IIOMetadataNode documentNode = metadata.getStandardDocumentNode();
            assertNotNull(documentNode);
            IIOMetadataNode subImageInterpretation = (IIOMetadataNode) documentNode.getElementsByTagName("SubimageInterpretation").item(0);
            assertEquals(value.toString(), subImageInterpretation.getAttribute("value"));
            assertTrue(allowedValues.contains(value.toString()));
        }
    }
 }
@@ -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);
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harald Kuhr	4b2ebec429	Added missing CRW pom	2021-05-13 15:13:55 +02:00
Harald Kuhr	0498a1a095	Added CRW read	2021-05-13 15:09:59 +02:00
Harald Kuhr	4fd20f7fa0	Updated to latest.	2021-05-13 15:08:51 +02:00
Harald Kuhr	c9bd68623a	Merge branch 'master' into camera-raw	2021-05-13 14:58:40 +02:00
Harald Kuhr	7ff74465d3	Merge pull request #426 from ckovorodkin/camera-raw-cr2-slice CR2ImageReader: unslice result of JPEGLosslessDecoder	2018-08-21 17:50:57 +02:00
Harald Kuhr	1f5bf80f7e	Merge pull request #424 from ckovorodkin/camera-raw Updated code base for raw modules	2018-08-21 17:48:45 +02:00
oermolaev	5c35c6e997	CR2ImageReader: unslice result of JPEGLosslessDecoder.	2018-05-05 03:21:10 +03:00
oermolaev	7692eeef5e	Merge branch 'jpeg-lossless-decoder-components' into camera-raw	2018-05-05 01:39:13 +03:00
oermolaev	cdadbf7051	The code base for raw modules was updated to compile in current environment.	2018-05-04 03:25:15 +03:00
oermolaev	7c2423bc94	Merge remote-tracking branch 'origin/master' into camera-raw # Conflicts: # imageio/pom.xml	2018-05-04 01:25:12 +03:00
Harald Kuhr	f9837d4540	TMI-DNG: Adding @Ignore on tests	2014-10-15 12:27:05 +02:00
Harald Kuhr	7728a912b1	TMI-CR2: Commented out lossless JPEG.	2014-10-15 12:26:29 +02:00
Harald Kuhr	923598636e	POM including camera RAW plugins.	2014-10-15 12:23:49 +02:00
Harald Kuhr	6ab0e64107	TMI-DNG: Initial commit.	2014-10-15 12:22:55 +02:00
Harald Kuhr	f69f706f60	TMI-NEF: Initial commit.	2014-10-15 12:22:38 +02:00
Harald Kuhr	53dd493cfa	TMI-CR2: Initial commit.	2014-10-15 12:22:12 +02:00
Harald Kuhr	607502fbbd	Merge pull request #68 from haraldk/master TMI-META: Now parsing SubIFDs.	2014-10-15 12:17:05 +02:00