#784 TIFF: No longer return incorrect standard image type for RGB with custom ICC profile

(cherry picked from commit b2f7cada21)

.github/workflows/ci.yml

@@ -17,13 +17,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        java: [ 8, 11, 17, 21 ]
+        java: [ 8, 11, 17, 20 ]
     runs-on: ${{ matrix.os }}
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -32,7 +32,7 @@ jobs:
       - name: Run Tests
         run: mvn --batch-mode --no-transfer-progress test
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@0831a82caad2465c31c6dd929978f640cb42556c # v4.0.3
+        uses: mikepenz/action-junit-report@150e2f992e4fad1379da2056d1d1c279f520e058 # v3.8.0
         if: ${{ !cancelled() }}
         with:
           report_paths: "**/target/surefire-reports/TEST*.xml"
@@ -47,11 +47,11 @@ jobs:
       matrix:
         kcms: [ true, false ]
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       - 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
+      - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
         with:
           distribution: 'jdkfile'
           jdkFile: ${{ runner.temp }}/java_package.tar.gz
@@ -66,7 +66,7 @@ jobs:
       - name: Run Tests
         run: mvn --batch-mode --no-transfer-progress test
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@0831a82caad2465c31c6dd929978f640cb42556c # v4.0.3
+        uses: mikepenz/action-junit-report@150e2f992e4fad1379da2056d1d1c279f520e058 # v3.8.0
         if: ${{ !cancelled() }}
         with:
           report_paths: "**/target/surefire-reports/TEST*.xml"
@@ -78,9 +78,9 @@ jobs:
     if: github.ref == 'refs/heads/master' # only perform on latest master
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       - name: Set up Maven Central
-        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+        uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
         with: # running setup-java again overwrites the settings.xml
           distribution: 'temurin'
           java-version: '8'

.github/workflows/codeql.yml

@@ -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}}"

.github/workflows/scorecard.yml

@@ -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

.gitignore

@@ -15,4 +15,3 @@ private
 profiles.xml
 Thumbs.db
 .DS_Store
-/.metadata/

README.md

@@ -1,8 +1,4 @@
 [![CI](https://github.com/haraldk/TwelveMonkeys/actions/workflows/ci.yml/badge.svg)](https://github.com/haraldk/TwelveMonkeys/actions/workflows/ci.yml)
-[![CodeQL](https://github.com/haraldk/TwelveMonkeys/actions/workflows/codeql.yml/badge.svg)](https://github.com/haraldk/TwelveMonkeys/actions/workflows/codeql.yml)
-[![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)
@@ -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.9.4</version>
     </dependency>
     <dependency>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio-tiff</artifactId>
-        <version>3.10.1</version>
+        <version>3.9.4</version>
     </dependency>
 
     <!--
@@ -293,7 +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.9.4</version>
     </dependency>
 
     <!--
@@ -302,7 +298,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.9.4</version>
         <classifier>jakarta</classifier>
     </dependency>
 </dependencies>
@@ -312,13 +308,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-io-3.10.1.jar
-    twelvemonkeys-common-image-3.10.1.jar
-    twelvemonkeys-imageio-core-3.10.1.jar
-    twelvemonkeys-imageio-metadata-3.10.1.jar
-    twelvemonkeys-imageio-jpeg-3.10.1.jar
-    twelvemonkeys-imageio-tiff-3.10.1.jar
+    twelvemonkeys-common-lang-3.9.4.jar
+    twelvemonkeys-common-io-3.9.4.jar
+    twelvemonkeys-common-image-3.9.4.jar
+    twelvemonkeys-imageio-core-3.9.4.jar
+    twelvemonkeys-imageio-metadata-3.9.4.jar
+    twelvemonkeys-imageio-jpeg-3.9.4.jar
+    twelvemonkeys-imageio-tiff-3.9.4.jar
 
 #### Deploying the plugins in a web app
 
@@ -384,44 +380,44 @@ Other "fat" JAR bundlers will probably have similar mechanisms to merge entries
 
 ### Links to prebuilt binaries
 
-##### Latest version (3.10.1)
+##### Latest version (3.9.4)
 
 The latest version that will run on Java 7 is 3.9.4. Later versions will require Java 8 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-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-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-lang-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.9.4/common-lang-3.9.4.jar)
+* [common-io-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.9.4/common-io-3.9.4.jar)
+* [common-image-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.9.4/common-image-3.9.4.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-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-core-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.9.4/imageio-core-3.9.4.jar)
+* [imageio-metadata-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.9.4/imageio-metadata-3.9.4.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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-bmp-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.9.4/imageio-bmp-3.9.4.jar)
+* [imageio-hdr-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.9.4/imageio-hdr-3.9.4.jar)
+* [imageio-icns-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.9.4/imageio-icns-3.9.4.jar)
+* [imageio-iff-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.9.4/imageio-iff-3.9.4.jar)
+* [imageio-jpeg-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.9.4/imageio-jpeg-3.9.4.jar)
+* [imageio-pcx-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.9.4/imageio-pcx-3.9.4.jar)
+* [imageio-pict-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.9.4/imageio-pict-3.9.4.jar)
+* [imageio-pnm-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.9.4/imageio-pnm-3.9.4.jar)
+* [imageio-psd-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.9.4/imageio-psd-3.9.4.jar)
+* [imageio-sgi-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.9.4/imageio-sgi-3.9.4.jar)
+* [imageio-tga-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.9.4/imageio-tga-3.9.4.jar)
+* [imageio-thumbsdb-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.9.4/imageio-thumbsdb-3.9.4.jar)
+* [imageio-tiff-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.9.4/imageio-tiff-3.9.4.jar)
+* [imageio-webp-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-webp/3.9.4/imageio-webp-3.9.4.jar)
+* [imageio-xwd-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-xwd/3.9.4/imageio-xwd-3.9.4.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.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.9.4/imageio-batik-3.9.4.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.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.9.4/imageio-clippath-3.9.4.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.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.9.4/servlet-3.9.4.jar)
 
 ## License
 

bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
 
     <groupId>com.twelvemonkeys.bom</groupId>

common/common-image/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-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>
@@ -36,13 +36,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

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

@@ -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;
                 }

common/common-io/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-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>

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

@@ -56,8 +56,8 @@ public class CompoundReader extends Reader {
 
     private int currentReader;
     private int markedReader;
-    private long mark;
-    private long next;
+    private int mark;
+    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;
         }

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

@@ -50,8 +50,8 @@ public class StringArrayReader extends StringReader {
     protected final Object finalLock;
     private int currentSting;
     private int markedString;
-    private long mark;
-    private long next;
+    private int mark;
+    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);
 

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

@@ -54,7 +54,7 @@ public final class SubStream extends FilterInputStream {
      */
     public SubStream(final InputStream stream, final long length) {
         super(Validate.notNull(stream, "stream"));
-        bytesLeft = Validate.isTrue(length >= 0, length, "length < 0: %s");
+        bytesLeft = length;
     }
 
     /**
@@ -63,11 +63,10 @@ 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) {
-                break;
-            }
+            //noinspection ResultOfMethodCallIgnored
+            skip(bytesLeft);
         }
     }
 
@@ -116,7 +115,7 @@ public final class SubStream extends FilterInputStream {
 
     @Override
     public long skip(long length) throws IOException {
-        long skipped = super.skip(findMaxLen(length)); // Skips 0 or more, never -1
+        long skipped = super.skip(findMaxLen(length));// Skips 0 or more, never -1
         bytesLeft -= skipped;
 
         return skipped;

common/common-io/src/test/java/com/twelvemonkeys/io/SubStreamTest.java

@@ -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());
-    }
-}

common/common-lang/pom.xml

@@ -4,25 +4,17 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-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>

common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <groupId>com.twelvemonkeys.common</groupId>
     <artifactId>common</artifactId>

contrib/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-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>
@@ -69,13 +69,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

imageio/imageio-batik/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-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.16</batik.version>
     </properties>
 
     <build>
@@ -33,18 +33,6 @@
                     </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>
 
@@ -63,7 +51,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.15.0</version>
+            <version>2.13.0</version>
             <scope>provided</scope>
         </dependency>
 

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

@@ -33,7 +33,6 @@ 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;
@@ -92,10 +91,10 @@ public class SVGImageReader extends ImageReaderBase {
     /**
      * Creates an {@code SVGImageReader}.
      *
-     * @param provider the provider
+     * @param pProvider the provider
      */
-    public SVGImageReader(final ImageReaderSpi provider) {
-        super(provider);
+    public SVGImageReader(final ImageReaderSpi pProvider) {
+        super(pProvider);
     }
 
     protected void resetMembers() {
@@ -109,20 +108,20 @@ public class SVGImageReader extends ImageReaderBase {
     }
 
     @Override
-    public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) {
-        super.setInput(input, seekForwardOnly, ignoreMetadata);
+    public void setInput(Object pInput, boolean seekForwardOnly, boolean ignoreMetadata) {
+        super.setInput(pInput, seekForwardOnly, ignoreMetadata);
 
         if (imageInput != null) {
-            TranscoderInput transcoderInput = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
-            rasterizer.setInput(transcoderInput);
+            TranscoderInput input = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
+            rasterizer.setInput(input);
         }
     }
 
-    public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException {
-        checkBounds(imageIndex);
+    public BufferedImage read(int pIndex, ImageReadParam pParam) throws IOException {
+        checkBounds(pIndex);
 
-        if (param instanceof SVGReadParam) {
-            SVGReadParam svgParam = (SVGReadParam) param;
+        if (pParam instanceof SVGReadParam) {
+            SVGReadParam svgParam = (SVGReadParam) pParam;
 
             // set the external-resource-resolution preference
             allowExternalResources = svgParam.isAllowExternalResources();
@@ -140,17 +139,17 @@ public class SVGImageReader extends ImageReaderBase {
         }
 
         Dimension size = null;
-        if (param != null) {
-            size = param.getSourceRenderSize();
+        if (pParam != null) {
+            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);
+        processImageStarted(pIndex);
 
         BufferedImage image = rasterizer.getImage();
 
@@ -174,18 +173,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();
         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, viewBox.getSize());
         }
 
         if (size != null) {
@@ -194,7 +193,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);
 
@@ -218,7 +217,7 @@ public class SVGImageReader extends ImageReaderBase {
         }
 
         // Background color
-        Paint bg = param.getBackgroundColor();
+        Paint bg = pParam.getBackgroundColor();
         if (bg != null) {
             hints.put(ImageTranscoder.KEY_BACKGROUND_COLOR, bg);
         }
@@ -226,10 +225,10 @@ public class SVGImageReader extends ImageReaderBase {
         return hints;
     }
 
-    private Dimension getSourceRenderSizeFromSubsamping(ImageReadParam param, Dimension origSize) {
-        if (param.getSourceXSubsampling() > 1 || param.getSourceYSubsampling() > 1) {
-            return new Dimension((int) (origSize.width / (float) param.getSourceXSubsampling()),
-                    (int) (origSize.height / (float) param.getSourceYSubsampling()));
+    private Dimension getSourceRenderSizeFromSubsamping(ImageReadParam pParam, Dimension pOrigSize) {
+        if (pParam.getSourceXSubsampling() > 1 || pParam.getSourceYSubsampling() > 1) {
+            return new Dimension((int) (pOrigSize.width / (float) pParam.getSourceXSubsampling()),
+                    (int) (pOrigSize.height / (float) pParam.getSourceYSubsampling()));
         }
         return null;
     }
@@ -238,19 +237,19 @@ public class SVGImageReader extends ImageReaderBase {
         return new SVGReadParam();
     }
 
-    public int getWidth(int imageIndex) throws IOException {
-        checkBounds(imageIndex);
+    public int getWidth(int pIndex) throws IOException {
+        checkBounds(pIndex);
 
         return rasterizer.getDefaultWidth();
     }
 
-    public int getHeight(int imageIndex) throws IOException {
-        checkBounds(imageIndex);
+    public int getHeight(int pIndex) throws IOException {
+        checkBounds(pIndex);
         return rasterizer.getDefaultHeight();
     }
 
     public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) {
-        return Collections.singleton(ImageTypeSpecifiers.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator();
+        return Collections.singleton(ImageTypeSpecifier.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator();
     }
 
     /**
@@ -602,7 +601,6 @@ public class SVGImageReader extends ImageReaderBase {
                 initialized = true;
 
                 try {
-                    super.addTranscodingHint(SVGAbstractTranscoder.KEY_ALLOW_EXTERNAL_RESOURCES, allowExternalResources);
                     super.transcode(transcoderInput, null);
                 }
                 catch (TranscoderException e) {
@@ -635,8 +633,8 @@ public class SVGImageReader extends ImageReaderBase {
             return viewBox.getBounds();
         }
 
-        void setInput(final TranscoderInput input) {
-            transcoderInput = input;
+        void setInput(final TranscoderInput pInput) {
+            transcoderInput = pInput;
         }
 
         @Override

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

@@ -60,22 +60,22 @@ public final class SVGImageReaderSpi extends ImageReaderSpiBase {
         super(new SVGProviderInfo());
     }
 
-    public boolean canDecodeInput(final Object source) throws IOException {
-        return source instanceof ImageInputStream && canDecode((ImageInputStream) source);
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        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'
-                            && input.read() == 'P' && input.read() == 'E') {
+                            && pInput.read() == 'T' && pInput.read() == 'Y'
+                            && 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();
         }
     }
 

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

@@ -51,16 +51,16 @@ public class SVGReadParam extends ImageReadParam {
         return background;
     }
 
-    public void setBackgroundColor(Paint color) {
-        background = color;
+    public void setBackgroundColor(Paint pColor) {
+        background = pColor;
     }
 
     public String getBaseURI() {
         return baseURI;
     }
 
-    public void setBaseURI(String baseURI) {
-        this.baseURI = baseURI;
+    public void setBaseURI(String pBaseURI) {
+        baseURI = pBaseURI;
     }
 
     public void setAllowExternalResources(boolean allow) {

imageio/imageio-bmp/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-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>

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

@@ -81,8 +81,8 @@ public final class BMPImageReader extends ImageReaderBase {
         super(new BMPImageReaderSpi());
     }
 
-    BMPImageReader(final ImageReaderSpi provider) {
-        super(provider);
+    BMPImageReader(final ImageReaderSpi pProvider) {
+        super(pProvider);
     }
 
     @Override
@@ -129,7 +129,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 +186,30 @@ public final class BMPImageReader extends ImageReaderBase {
     }
 
     @Override
-    public int getWidth(int imageIndex) throws IOException {
-        checkBounds(imageIndex);
+    public int getWidth(int pImageIndex) throws IOException {
+        checkBounds(pImageIndex);
 
         return header.getWidth();
     }
 
     @Override
-    public int getHeight(int imageIndex) throws IOException {
-        checkBounds(imageIndex);
+    public int getHeight(int pImageIndex) throws IOException {
+        checkBounds(pImageIndex);
 
         return header.getHeight();
     }
 
     @Override
-    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
-        checkBounds(imageIndex);
+    public Iterator<ImageTypeSpecifier> getImageTypes(int pImageIndex) throws IOException {
+        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 {
-        checkBounds(imageIndex);
+    public ImageTypeSpecifier getRawImageType(int pImageIndex) throws IOException {
+        checkBounds(pImageIndex);
 
         if (header.getPlanes() != 1) {
             throw new IIOException("Multiple planes not supported");
@@ -686,8 +685,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 {
-        throw (T) throwable;
+    static <T extends Throwable> void throwAs(final Class<T> pType, final Throwable pThrowable) throws T {
+        throw (T) pThrowable;
     }
 
     private class ListenerDelegator extends ProgressListenerBase implements IIOReadUpdateListener, IIOReadWarningListener {

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

@@ -65,16 +65,16 @@ public final class BMPImageReaderSpi extends ImageReaderSpiBase {
         }
     }
 
-    public boolean canDecodeInput(final Object source) throws IOException {
-        return source instanceof ImageInputStream && canDecode((ImageInputStream) source);
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        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();
-            input.readFully(fileHeader);
+            pInput.mark();
+            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) {
         return new BMPImageReader(this);
     }
 
-    public String getDescription(final Locale locale) {
+    public String getDescription(final Locale pLocale) {
         return "Windows Device Independent Bitmap Format (BMP) Reader";
     }
 }

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

@@ -47,7 +47,7 @@ import java.nio.ByteOrder;
  * BMPImageWriter
  */
 public final class BMPImageWriter extends DIBImageWriter {
-    BMPImageWriter(ImageWriterSpi provider) {
+    protected BMPImageWriter(ImageWriterSpi provider) {
         super(provider);
     }
 

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

@@ -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");

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

@@ -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) {
-        this.entry = notNull(entry, "entry");
-        this.header = notNull(header, "header");
+    public BitmapDescriptor(final DirectoryEntry pEntry, final DIBHeader pHeader) {
+        entry = notNull(pEntry, "entry");;
+        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;
     }
 

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

@@ -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 {
-    final int[] bits;
-    final int[] colors;
-
-    public BitmapIndexed(final DirectoryEntry entry, final DIBHeader header) {
-        super(entry, header);
+class BitmapIndexed extends BitmapDescriptor {
+    protected final int[] bits;
+    protected final int[] colors;
 
+    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(icm, raster, icm.isAlphaPremultiplied(), properties);
+        BufferedImage image = new BufferedImage(
+                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,
-                                   bits <= 8 ? DataBuffer.TYPE_BYTE : DataBuffer.TYPE_USHORT);
+        return new IndexColorModel(
+                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) {

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

@@ -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 {
-    final BitmapIndexed bitMask;
+class BitmapMask extends BitmapDescriptor {
+    protected final BitmapIndexed bitMask;
 
-    public BitmapMask(final DirectoryEntry parent, final DIBHeader header) {
-        super(parent, header);
-        bitMask = new BitmapIndexed(parent, header);
+    public BitmapMask(final DirectoryEntry pParent, final DIBHeader pHeader) {
+        super(pParent, pHeader);
+        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() {

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

@@ -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) {
-        super(entry, header);
+    public BitmapRGB(final DirectoryEntry pEntry, final DIBHeader pHeader) {
+        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)) {

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

@@ -30,10 +30,11 @@
 
 package com.twelvemonkeys.imageio.plugins.bmp;
 
-import javax.imageio.IIOException;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
 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 {
-    private final String message;
+class BitmapUnsupported extends BitmapDescriptor {
+    private String message;
 
-    public BitmapUnsupported(final DirectoryEntry entry, DIBHeader header, final String message) {
-        super(entry, header);
+    public BitmapUnsupported(final DirectoryEntry pEntry, DIBHeader header, final String pMessage) {
+        super(pEntry, header);
 
-        this.message = message;
+        message = pMessage;
     }
 
     @Override

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

@@ -48,22 +48,22 @@ public final class CURImageReader extends DIBImageReader {
         super(new CURImageReaderSpi());
     }
 
-    CURImageReader(final ImageReaderSpi provider) {
-        super(provider);
+    protected CURImageReader(final ImageReaderSpi pProvider) {
+        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 {
-        DirectoryEntry.CUREntry entry = (DirectoryEntry.CUREntry) getEntry(imageIndex);
+    public final Point getHotSpot(final int pImageIndex) throws IOException {
+        DirectoryEntry.CUREntry entry = (DirectoryEntry.CUREntry) getEntry(pImageIndex);
         return entry.getHotspot();
     }
 }

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

@@ -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 {
-        return source instanceof ImageInputStream && ICOImageReaderSpi.canDecode((ImageInputStream) source, DIB.TYPE_CUR);
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        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";
     }
 }

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

@@ -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 {
-        int size = stream.readInt();
+    public static DIBHeader read(final DataInput pStream) throws IOException {
+        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 {
-        switch (size) {
+    private static DIBHeader createHeader(final int pSize) throws IOException {
+        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 write(final DataOutput stream) throws IOException;
+    protected abstract void read(int pSize, DataInput pStream) 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 size, final DataInput stream) throws IOException {
-            if (size != DIB.BITMAP_CORE_HEADER_SIZE) {
-                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.BITMAP_CORE_HEADER_SIZE));
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
+            if (pSize != DIB.BITMAP_CORE_HEADER_SIZE) {
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, 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();
-            height = stream.readShort();
+            width = pStream.readUnsignedShort();
+            height = pStream.readShort();
 
             if (height < 0) {
                 height = -height;
                 topDown = true;
             }
 
-            planes = stream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
-        }
-
-        @Override
-        protected void write(DataOutput stream) {
-            throw new UnsupportedOperationException();
+            planes = pStream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
         }
 
         public String getBMPVersion() {
@@ -248,51 +242,45 @@ abstract class DIBHeader {
      */
     static final class BitmapCoreHeaderV2 extends DIBHeader {
         @SuppressWarnings("unused")
-        @Override
-        protected void read(final int size, final DataInput stream) throws IOException {
-            if (size != DIB.OS2_V2_HEADER_SIZE && size != DIB.OS2_V2_HEADER_16_SIZE) {
-                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.OS2_V2_HEADER_SIZE));
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
+            if (pSize != DIB.OS2_V2_HEADER_SIZE && pSize != DIB.OS2_V2_HEADER_16_SIZE) {
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, DIB.OS2_V2_HEADER_SIZE));
             }
 
-            this.size = size;
+            size = pSize;
 
-            width = stream.readInt();
-            height = stream.readInt();
+            width = pStream.readInt();
+            height = pStream.readInt();
 
             if (height < 0) {
                 height = -height;
                 topDown = true;
             }
 
-            planes = stream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
+            planes = pStream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
 
-            if (size != DIB.OS2_V2_HEADER_16_SIZE) {
-                compression = stream.readInt();
+            if (pSize != DIB.OS2_V2_HEADER_16_SIZE) {
+                compression = pStream.readInt();
 
-                imageSize = stream.readInt();
+                imageSize = pStream.readInt();
 
-                xPixelsPerMeter = stream.readInt();
-                yPixelsPerMeter = stream.readInt();
+                xPixelsPerMeter = pStream.readInt();
+                yPixelsPerMeter = pStream.readInt();
 
-                colorsUsed = stream.readInt();
-                colorsImportant = stream.readInt();
+                colorsUsed = pStream.readInt();
+                colorsImportant = pStream.readInt();
             }
 
             // TODO: Use? These fields are not reflected in metadata as per now...
-            int units = stream.readShort();
-            int reserved = stream.readShort();
-            int recording = stream.readShort(); // Recording algorithm
-            int rendering = stream.readShort(); // Halftoning algorithm
-            int size1 = stream.readInt(); // Reserved for halftoning use
-            int size2 = stream.readInt(); // Reserved for halftoning use
-            int colorEncoding = stream.readInt(); // Color model used in bitmap
-            int identifier = stream.readInt(); // Reserved for application use
-        }
-
-        @Override
-        protected void write(DataOutput stream) {
-            throw new UnsupportedOperationException();
+            int units = pStream.readShort();
+            int reserved = pStream.readShort();
+            int recording = pStream.readShort(); // Recording algorithm
+            int rendering = pStream.readShort(); // Halftoning algorithm
+            int size1 = pStream.readInt(); // Reserved for halftoning use
+            int size2 = pStream.readInt(); // Reserved for halftoning use
+            int colorEncoding = pStream.readInt(); // Color model used in bitmap
+            int identifier = pStream.readInt(); // Reserved for application use
         }
 
         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 size, final DataInput stream) throws IOException {
-            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", size, DIB.BITMAP_INFO_HEADER_SIZE));
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
+            if (!(pSize == DIB.BITMAP_INFO_HEADER_SIZE || pSize == DIB.BITMAP_V2_INFO_HEADER_SIZE || pSize == DIB.BITMAP_V3_INFO_HEADER_SIZE)) {
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, DIB.BITMAP_INFO_HEADER_SIZE));
             }
 
-            this.size = size;
+            size = pSize;
 
-            width = stream.readInt();
-            height = stream.readInt();
+            width = pStream.readInt();
+            height = pStream.readInt();
 
             if (height < 0) {
                 height = -height;
                 topDown = true;
             }
 
-            planes = stream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
-            compression = stream.readInt();
+            planes = pStream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
+            compression = pStream.readInt();
 
-            imageSize = stream.readInt();
+            imageSize = pStream.readInt();
 
-            xPixelsPerMeter = stream.readInt();
-            yPixelsPerMeter = stream.readInt();
+            xPixelsPerMeter = pStream.readInt();
+            yPixelsPerMeter = pStream.readInt();
 
-            colorsUsed = stream.readInt();
-            colorsImportant = stream.readInt();
+            colorsUsed = pStream.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) {
-                masks = readMasks(stream, false);
+            if (size == DIB.BITMAP_V2_INFO_HEADER_SIZE || compression == DIB.COMPRESSION_BITFIELDS) {
+                masks = readMasks(pStream, false);
             }
-            else if (this.size == DIB.BITMAP_V3_INFO_HEADER_SIZE || compression == DIB.COMPRESSION_ALPHA_BITFIELDS) {
-                masks = readMasks(stream, true);
+            else if (size == DIB.BITMAP_V3_INFO_HEADER_SIZE || compression == DIB.COMPRESSION_ALPHA_BITFIELDS) {
+                masks = readMasks(pStream, true);
             }
         }
 
-        @Override
-        protected void write(final DataOutput stream) throws IOException {
+        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 size, final DataInput stream) throws IOException {
-            if (size != DIB.BITMAP_V4_INFO_HEADER_SIZE) {
-                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.BITMAP_V4_INFO_HEADER_SIZE));
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
+            if (pSize != DIB.BITMAP_V4_INFO_HEADER_SIZE) {
+                throw new IIOException(String.format("Size: %s !=: %s", pSize, DIB.BITMAP_V4_INFO_HEADER_SIZE));
             }
 
-            this.size = size;
+            size = pSize;
 
-            width = stream.readInt();
-            height = stream.readInt();
+            width = pStream.readInt();
+            height = pStream.readInt();
 
             if (height < 0) {
                 height = -height;
                 topDown = true;
             }
 
-            planes = stream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
-            compression = stream.readInt();
+            planes = pStream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
+            compression = pStream.readInt();
 
-            imageSize = stream.readInt();
+            imageSize = pStream.readInt();
 
-            xPixelsPerMeter = stream.readInt();
-            yPixelsPerMeter = stream.readInt();
+            xPixelsPerMeter = pStream.readInt();
+            yPixelsPerMeter = pStream.readInt();
 
-            colorsUsed = stream.readInt();
-            colorsImportant = stream.readInt();
+            colorsUsed = pStream.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 {
-            if (size != DIB.BITMAP_V5_INFO_HEADER_SIZE) {
-                throw new IIOException(String.format("Size: %s !=: %s", size, DIB.BITMAP_V5_INFO_HEADER_SIZE));
+        protected void read(final int pSize, final DataInput pStream) throws IOException {
+            if (pSize != 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();
-            height = stream.readInt();
+            width = pStream.readInt();
+            height = pStream.readInt();
 
             if (height < 0) {
                 height = -height;
                 topDown = true;
             }
 
-            planes = stream.readUnsignedShort();
-            bitCount = stream.readUnsignedShort();
-            compression = stream.readInt();
+            planes = pStream.readUnsignedShort();
+            bitCount = pStream.readUnsignedShort();
+            compression = pStream.readInt();
 
-            imageSize = stream.readInt();
+            imageSize = pStream.readInt();
 
-            xPixelsPerMeter = stream.readInt();
-            yPixelsPerMeter = stream.readInt();
+            xPixelsPerMeter = pStream.readInt();
+            yPixelsPerMeter = pStream.readInt();
 
-            colorsUsed = stream.readInt();
-            colorsImportant = stream.readInt();
+            colorsUsed = pStream.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
-            profileData = stream.readInt() & 0xffffffffL;
-            profileSize = stream.readInt() & 0xffffffffL;
-            stream.readInt(); // Reserved
-        }
-
-        @Override
-        protected void write(DataOutput stream) {
-            throw new UnsupportedOperationException();
+            intent = pStream.readInt(); // TODO: Verify if this is same as ICC intent
+            profileData = pStream.readInt() & 0xffffffffL;
+            profileSize = pStream.readInt() & 0xffffffffL;
+            pStream.readInt(); // Reserved
         }
 
         public String getBMPVersion() {

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

@@ -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.event.*;
+import java.awt.color.ColorSpace;
+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 final Map<DirectoryEntry, BitmapDescriptor> descriptors = new WeakWeakMap<>();
+    private Map<DirectoryEntry, DIBHeader> headers = new WeakHashMap<>();
+    private Map<DirectoryEntry, BitmapDescriptor> descriptors = new WeakWeakMap<>();
 
     private ImageReader pngImageReader;
 
-    protected DIBImageReader(final ImageReaderSpi provider) {
-        super(provider);
+    protected DIBImageReader(final ImageReaderSpi pProvider) {
+        super(pProvider);
     }
 
     protected void resetMembers() {
@@ -100,8 +102,8 @@ abstract class DIBImageReader extends ImageReaderBase {
         }
     }
 
-    public Iterator<ImageTypeSpecifier> getImageTypes(final int imageIndex) throws IOException {
-        DirectoryEntry entry = getEntry(imageIndex);
+    public Iterator<ImageTypeSpecifier> getImageTypes(final int pImageIndex) throws IOException {
+        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 {
-        return getEntry(imageIndex).getWidth();
+    public int getWidth(final int pImageIndex) throws IOException {
+        return getEntry(pImageIndex).getWidth();
     }
 
-    public int getHeight(final int imageIndex) throws IOException {
-        return getEntry(imageIndex).getHeight();
+    public int getHeight(final int pImageIndex) throws IOException {
+        return getEntry(pImageIndex).getHeight();
     }
 
-    public BufferedImage read(final int imageIndex, final ImageReadParam param) throws IOException {
-        checkBounds(imageIndex);
+    public BufferedImage read(final int pImageIndex, final ImageReadParam pParam) throws IOException {
+        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) ?
-                    getDestination(param, getImageTypes(imageIndex), getWidth(imageIndex), getHeight(imageIndex)) : null;
+            destination = hasExplicitDestination(pParam) ?
+                    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) {
-                image = fakeAOI(image, param);
-                image = ImageUtil.toBuffered(fakeSubsampling(image, param));
+            if (pParam != null) {
+                image = fakeAOI(image, pParam);
+                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 {
-        return initPNGReader(entry).getImageTypes(0);
+    private Iterator<ImageTypeSpecifier> getImageTypesPNG(final DirectoryEntry pEntry) throws IOException {
+        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());
-        ImageInputStream stream = new SubImageInputStream(imageInput, entry.getSize());
+        imageInput.seek(pEntry.getOffset());
+//        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 {
-        if (!headers.containsKey(entry)) {
-            imageInput.seek(entry.getOffset());
+    private DIBHeader getHeader(final DirectoryEntry pEntry) throws IOException {
+        if (!headers.containsKey(pEntry)) {
+            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)) {
-            DIBHeader header = getHeader(entry);
+        if (descriptor == null || !descriptors.containsKey(pEntry)) {
+            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 {
-        readColorMap(bitmap);
+    private void readBitmapIndexed(final BitmapIndexed pBitmap) throws IOException {
+        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 {
-        int colorCount = bitmap.getColorCount();
+    private void readColorMap(final BitmapIndexed pBitmap) throws IOException {
+        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 {
-        int width = adjustToPadding((bitmap.getWidth() + 7) >> 3);
+    private void readBitmapIndexed1(final BitmapIndexed pBitmap, final boolean pAsMask) throws IOException {
+        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++) {
-                bitmap.bits[pos++] = ((row[rowPos] & xOrVal) / xOrVal) & 0xFF;
+            for (int x = 0; x < pBitmap.getWidth(); x++) {
+                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
-            if (!asMask) {
+            // NOTE: If we are reading the mask, we don't abort or report progress
+            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 {
-        int width = adjustToPadding((bitmap.getWidth() + 1) >> 1);
+    private void readBitmapIndexed4(final BitmapIndexed pBitmap) throws IOException {
+        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 {
-        int width = adjustToPadding(bitmap.getWidth());
+    private void readBitmapIndexed8(final BitmapIndexed pBitmap) throws IOException {
+        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++) {
-                bitmap.bits[pos++] = row[rowPos++] & 0xFF;
+            for (int x = 0; x < pBitmap.getWidth(); x++) {
+                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) {
-        if ((width & 0x03) != 0) {
-             return (width & ~0x03) + 4;
+    private static int adjustToPadding(final int pWidth) {
+        if ((pWidth & 0x03) != 0) {
+             return (pWidth & ~0x03) + 4;
         }
-
-        return width;
+        return pWidth;
     }
 
-    private void readBitmap16(final BitmapDescriptor bitmap) throws IOException {
-        short[] pixels = new short[bitmap.getWidth() * bitmap.getHeight()];
+    private void readBitmap16(final BitmapDescriptor pBitmap) throws IOException {
+        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++) {
-            int offset = (bitmap.getHeight() - y - 1) * bitmap.getWidth();
-            imageInput.readFully(pixels, offset, bitmap.getWidth());
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
+            int offset = (pBitmap.getHeight() - y - 1) * pBitmap.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 {
-        byte[] pixels = new byte[bitmap.getWidth() * bitmap.getHeight() * 3];
+    private void readBitmap24(final BitmapDescriptor pBitmap) throws IOException {
+        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++) {
-            int offset = (bitmap.getHeight() - y - 1) * scanlineStride;
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
+            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()) {
-            BitmapMask mask = new BitmapMask(bitmap.entry, bitmap.header);
+        if (pBitmap.hasMask()) {
+            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 {
-        int[] pixels = new int[bitmap.getWidth() * bitmap.getHeight()];
+    private void readBitmap32(final BitmapDescriptor pBitmap) throws IOException {
+        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++) {
-            int offset = (bitmap.getHeight() - y - 1) * bitmap.getWidth();
-            imageInput.readFully(pixels, offset, bitmap.getWidth());
+        for (int y = 0; y < pBitmap.getHeight(); y++) {
+            int offset = (pBitmap.getHeight() - y - 1) * pBitmap.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()) {
-            throw new IndexOutOfBoundsException(String.format("Index: %d, ImageCount: %d", imageIndex, directory.count()));
+        if (pImageIndex < 0 || pImageIndex >= 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 {
-        if (args.length == 0) {
+    public static void main(final String[] pArgs) throws IOException {
+        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 {
-        File file = new File(fileName);
+    private static void readImagesInFile(String pFileName, ImageReader pReader, final Container pContainer) throws IOException {
+        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));
-        int imageCount = reader.getNumImages(true);
+        pReader.setInput(ImageIO.createImageInputStream(file));
+        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) {
-        JFrame frame = new JFrame(title);
+    private static JFrame createWindow(final String pTitle) {
+        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) {
-                BufferedImage pattern = graphicsConfiguration.createCompatibleImage(20, 20);
+            private void createTexture(final GraphicsConfiguration pGraphicsConfiguration) {
+                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);
     }
 }

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

@@ -44,25 +44,24 @@ import java.util.List;
 class Directory {
     private final List<DirectoryEntry> entries;
 
-    private Directory(int imageCount) {
-        entries = Arrays.asList(new DirectoryEntry[imageCount]);
+    private Directory(int pImageCount) {
+        entries = Arrays.asList(new DirectoryEntry[pImageCount]);
     }
 
-    public static Directory read(final int type, final int imageCount, final DataInput stream) throws IOException {
-        Directory directory = new Directory(imageCount);
-        directory.readEntries(type,  stream);
-
+    public static Directory read(final int pType, final int pImageCount, final DataInput pStream) throws IOException {
+        Directory directory = new Directory(pImageCount);
+        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) {
-        return entries.get(entryIndex);
+    public DirectoryEntry getEntry(final int pEntryIndex) {
+        return entries.get(pEntryIndex);
     }
 
     public int count() {

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

@@ -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 {
-        DirectoryEntry entry = createEntry(type);
-        entry.read(stream);
-
+    public static DirectoryEntry read(final int pType, final DataInput pStream) throws IOException {
+        DirectoryEntry entry = createEntry(pType);
+        entry.read(pStream);
         return entry;
     }
 
-    private static DirectoryEntry createEntry(int type) throws IIOException {
-        switch (type) {
+    private static DirectoryEntry createEntry(int pType) throws IIOException {
+        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
-        bitCount = stream.readUnsignedShort();   // bit count for ICO, y hotspot for CUR
+        planes = pStream.readUnsignedShort();     // Should be 0 or 1 for ICO, x hotspot for CUR
+        bitCount = pStream.readUnsignedShort();   // bit count for ICO, y hotspot for CUR
 
         // Size of bitmap in bytes
-        size = stream.readInt();
-        offset = stream.readInt();
+        size = pStream.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 {
-            super.read(stream);
+        protected void read(final DataInput pStream) throws IOException {
+            super.read(pStream);
 
             // NOTE: This is a hack...
             xHotspot = planes;

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

@@ -46,7 +46,7 @@ public final class ICOImageReader extends DIBImageReader {
         super(new ICOImageReaderSpi());
     }
 
-    ICOImageReader(final ImageReaderSpi provider) {
-        super(provider);
+    protected ICOImageReader(final ImageReaderSpi pProvider) {
+        super(pProvider);
     }
 }

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

@@ -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 {
-        return source instanceof ImageInputStream && canDecode((ImageInputStream) source, DIB.TYPE_ICO);
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        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();
-            input.readFully(signature);
+            pInput.mark();
+            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";
     }
 }

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

@@ -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.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
+import javax.imageio.*;
 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) {

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

@@ -30,14 +30,24 @@
 
 package com.twelvemonkeys.imageio.plugins.bmp;
 
-import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
-import com.twelvemonkeys.xml.XMLSerializer;
+import static org.junit.Assert.*;
+import static org.junit.Assume.assumeNoException;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
 
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mockito.InOrder;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+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 static org.junit.Assume.assumeNoException;
-import static org.mockito.ArgumentMatchers.anyFloat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
+import com.twelvemonkeys.xml.XMLSerializer;
 
 /**
  * BMPImageReaderTest
@@ -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"));
-            jreReader = provider.createReaderInstance();
+            @SuppressWarnings("unchecked")
+            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();

imageio/imageio-clippath/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-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>

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

@@ -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()) {

imageio/imageio-core/pom.xml

@@ -4,13 +4,10 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-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>

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

@@ -188,7 +188,7 @@ public final class ColorSpaces {
         // 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();
     }

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

@@ -257,18 +257,18 @@ public final class ImageTypeSpecifiers {
         return createFromIndexColorModel(new IndexColorModel(bits, colors.length, colors, 0, hasAlpha, transIndex, dataType));
     }
 
-    public static ImageTypeSpecifier createFromIndexColorModel(final IndexColorModel colorModel) {
-        return new IndexedImageTypeSpecifier(colorModel);
+    public static ImageTypeSpecifier createFromIndexColorModel(final IndexColorModel pColorModel) {
+        return new IndexedImageTypeSpecifier(pColorModel);
     }
 
-    public static ImageTypeSpecifier createDiscreteAlphaIndexedFromIndexColorModel(final IndexColorModel colorModel) {
-        ColorModel discreteAlphaIndexColorModel = new DiscreteAlphaIndexColorModel(colorModel);
-        return new ImageTypeSpecifier(discreteAlphaIndexColorModel, discreteAlphaIndexColorModel.createCompatibleSampleModel(1, 1));
+    public static ImageTypeSpecifier createDiscreteAlphaIndexedFromIndexColorModel(final IndexColorModel pColorModel) {
+        ColorModel colorModel = new DiscreteAlphaIndexColorModel(pColorModel);
+        return new ImageTypeSpecifier(colorModel, colorModel.createCompatibleSampleModel(1, 1));
     }
 
-    public static ImageTypeSpecifier createDiscreteExtraSamplesIndexedFromIndexColorModel(final IndexColorModel colorModel, int extraSamples, boolean hasAlpha) {
-        ColorModel discreteAlphaIndexColorModel = new DiscreteAlphaIndexColorModel(colorModel, extraSamples, hasAlpha);
-        return new ImageTypeSpecifier(discreteAlphaIndexColorModel, discreteAlphaIndexColorModel.createCompatibleSampleModel(1, 1));
+    public static ImageTypeSpecifier createDiscreteExtraSamplesIndexedFromIndexColorModel(final IndexColorModel pColorModel, int extraSamples, boolean hasAlpha) {
+        ColorModel colorModel = new DiscreteAlphaIndexColorModel(pColorModel, extraSamples, hasAlpha);
+        return new ImageTypeSpecifier(colorModel, colorModel.createCompatibleSampleModel(1, 1));
     }
 
     public static ImageTypeSpecifier createFromRenderedImage(RenderedImage image) {
@@ -279,9 +279,7 @@ public final class ImageTypeSpecifiers {
         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) {
+            if (bufferedImageType != BufferedImage.TYPE_CUSTOM) {
                 return createFromBufferedImageType(bufferedImageType);
             }
         }

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

@@ -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) {

imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/StandardImageMetadataSupportTest.java

@@ -17,7 +17,6 @@ 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;
@@ -171,7 +170,7 @@ public class StandardImageMetadataSupportTest {
 
     @Test
     public void withTextValuesMap() {
-        Map<String, String> entries = new LinkedHashMap<>();
+        Map<String, String> entries = new HashMap<>();
         entries.put("foo", "bar");
         entries.put("bar", "xyzzy");
 

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

@@ -31,7 +31,6 @@
 package com.twelvemonkeys.imageio.util;
 
 import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
-import com.twelvemonkeys.lang.Validate;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -39,18 +38,14 @@ import org.mockito.InOrder;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import javax.imageio.IIOException;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.*;
 import javax.imageio.event.IIOReadProgressListener;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.spi.IIORegistry;
 import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 import java.awt.*;
-import java.awt.geom.*;
+import java.awt.geom.AffineTransform;
 import java.awt.image.*;
 import java.io.File;
 import java.io.IOException;
@@ -58,7 +53,6 @@ import java.lang.reflect.ParameterizedType;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -608,7 +602,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         assertReadWithSourceRegionParamEqualImage(new Rectangle(3, 3, 9, 9), getTestData().get(0), 0);
     }
 
-    protected void assertReadWithSourceRegionParamEqualImage(final Rectangle r, final TestData data, @SuppressWarnings("SameParameterValue") final int imageIndex) throws IOException {
+    protected void assertReadWithSourceRegionParamEqualImage(final Rectangle r, final TestData data, final int imageIndex) throws IOException {
         ImageReader reader = createReader();
         try (ImageInputStream inputStream = data.getInputStream()) {
             reader.setInput(inputStream);
@@ -1834,51 +1828,52 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         private final List<Dimension> sizes;
         private final List<BufferedImage> images;
 
-        public TestData(final Object input, final Dimension... dimensions) {
-            this(input, Arrays.asList(dimensions), null);
+        public TestData(final Object pInput, final Dimension... pSizes) {
+            this(pInput, Arrays.asList(pSizes), null);
         }
 
-        public TestData(final Object input, final BufferedImage... images) {
-            this(input, null, Arrays.asList(images));
+        public TestData(final Object pInput, final BufferedImage... pImages) {
+            this(pInput, null, Arrays.asList(pImages));
         }
 
-        public TestData(final Object input, final List<Dimension> dimensions, final List<BufferedImage> images) {
-            Validate.notNull(input, "input");
-            Validate.isTrue(dimensions != null || images != null, "Need either dimensions or image");
-
-            List<Dimension> combinedDimensions;
-            if (dimensions == null) {
-                // Copy dimensions  from images
-                combinedDimensions = new ArrayList<>(images.size());
-
-                for (BufferedImage image : images) {
-                    combinedDimensions.add(new Dimension(image.getWidth(), image.getHeight()));
-                }
-            }
-            else {
-                // Validate equal dimensions
-                if (images != null) {
-                    if (images.size() != dimensions.size()) {
-                        throw new IllegalArgumentException("Dimensions and images parameter's size differs");
-                    }
-
-                    for (int i = 0; i < dimensions.size(); i++) {
-                        if (!new Dimension(images.get(i).getWidth(), images.get(i).getHeight()).equals(dimensions.get(i))) {
-                            throw new IllegalArgumentException("Dimensions and images parameter's dimensions differ");
-                        }
-                    }
-                }
-
-                combinedDimensions = new ArrayList<>(dimensions);
+        public TestData(final Object pInput, final List<Dimension> pSizes, final List<BufferedImage> pImages) {
+            if (pInput == null) {
+                throw new IllegalArgumentException("input == null");
             }
 
-            this.sizes = Collections.unmodifiableList(combinedDimensions);
+            sizes = new ArrayList<>();
+            images = new ArrayList<>();
 
-            this.images = images != null
-                    ? Collections.unmodifiableList(new ArrayList<>(images))
-                    : Collections.<BufferedImage>emptyList();
+            List<Dimension> sizes = pSizes;
+            if (sizes == null) {
+                sizes = new ArrayList<>();
+                if (pImages != null) {
+                    for (BufferedImage image : pImages) {
+                        sizes.add(new Dimension(image.getWidth(), image.getHeight()));
+                    }
+                }
+                else {
+                    throw new IllegalArgumentException("Need either size or image");
+                }
+            }
+            else if (pImages != null) {
+                if (pImages.size() != pSizes.size()) {
+                    throw new IllegalArgumentException("Size parameter and image size differs");
+                }
+                for (int i = 0; i < sizes.size(); i++) {
+                    if (!new Dimension(pImages.get(i).getWidth(), pImages.get(i).getHeight()).equals(sizes.get(i))) {
+                        throw new IllegalArgumentException("Size parameter and image size differs");
+                    }
 
-            this.input = input;
+                }
+            }
+
+            this.sizes.addAll(sizes);
+            if (pImages != null) {
+                images.addAll(pImages);
+            }
+
+            input = pInput;
         }
 
         public Object getInput() {
@@ -1903,13 +1898,13 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
             return sizes.size();
         }
 
-        public Dimension getDimension(final int index) {
-            return sizes.get(index);
+        public Dimension getDimension(final int pIndex) {
+            return sizes.get(pIndex);
         }
 
         @SuppressWarnings("unused")
-        public BufferedImage getImage(final int index) {
-            return images.get(index);
+        public BufferedImage getImage(final int pIndex) {
+            return images.get(pIndex);
         }
 
         @Override

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

@@ -39,7 +39,6 @@ import java.awt.color.*;
 import java.awt.image.*;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 
 public class ImageTypeSpecifiersTest {
 
@@ -737,7 +736,6 @@ public class ImageTypeSpecifiersTest {
             ImageTypeSpecifier fromType = ImageTypeSpecifiers.createFromBufferedImageType(type);
 
             assertEquals(fromConstructor.getColorModel(), fromType.getColorModel());
-            assertEquals(fromConstructor.getSampleModel(), fromType.getSampleModel());
         }
     }
 
@@ -749,43 +747,13 @@ public class ImageTypeSpecifiersTest {
             ImageTypeSpecifier fromImage = ImageTypeSpecifiers.createFromRenderedImage(image);
 
             assertEquals(fromConstructor.getColorModel(), fromImage.getColorModel());
-            assertEquals(fromConstructor.getSampleModel(), fromImage.getSampleModel());
         }
     }
 
-    @Test
-    public void testCreateFromRenderedImageIndexedBinaryShouldRetainPalette() {
-        IndexColorModel whiteIsZero = new IndexColorModel(1, 2, new int[]{0xFFFFFFFF, 0xFF000000}, 0, false, -1, DataBuffer.TYPE_BYTE);
-
-        BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_BINARY, whiteIsZero);
-        ImageTypeSpecifier fromImage = ImageTypeSpecifiers.createFromRenderedImage(image);
-
-        assertEquals(whiteIsZero, fromImage.getColorModel());
-        assertSame(whiteIsZero, fromImage.getColorModel()); // Note: This can be relaxed to asserting the LUTs are equal
-        assertEquals(image.getSampleModel(), fromImage.getSampleModel());
-    }
-
-    @Test
-    public void testCreateFromRenderedImageIndexedShouldRetainPalette() {
-        IndexColorModel palette = new IndexColorModel(4, 16, new int[]{
-                0xFFFFFFFF, 0xFF999999, 0xFF666666, 0xFF333333,
-                0xFF000000, 0xFF00202E, 0xFF003F5C, 0xFF2C4875,
-                0xFF8A508F, 0xFFBC5090, 0xFFFF6361, 0xFFFF8531,
-                0xFFFFA600, 0xFFFFD380, 0xFF74A892, 0xFF008585
-        }, 0, false, -1, DataBuffer.TYPE_BYTE);
-
-        BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_INDEXED, palette);
-        ImageTypeSpecifier fromImage = ImageTypeSpecifiers.createFromRenderedImage(image);
-
-        assertEquals(palette, fromImage.getColorModel());
-        assertSame(palette, fromImage.getColorModel()); // Note: This can be relaxed to asserting the LUTs are equal
-        assertEquals(image.getSampleModel(), fromImage.getSampleModel());
-    }
-
     private static byte[] createByteLut(final int count) {
         byte[] lut = new byte[count];
         for (int i = 0; i < count; i++) {
-            lut[i] = (byte) (i * 255 / count);
+            lut[i] = (byte) count;
         }
         return lut;
     }
@@ -794,8 +762,7 @@ public class ImageTypeSpecifiersTest {
         int[] lut = new int[count];
 
         for (int i = 0; i < count; i++) {
-            int val = (i * 255 / count);
-            lut[i] = 0xff000000 | val << 16 | val << 8 | val;
+            lut[i] = 0xff000000 | count << 16 | count << 8 | count;
         }
 
         return lut;

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

@@ -43,17 +43,15 @@ import javax.imageio.spi.IIORegistry;
 import javax.imageio.spi.ImageWriterSpi;
 import javax.imageio.stream.ImageOutputStream;
 import java.awt.*;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.net.URL;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 /**
@@ -110,8 +108,8 @@ public abstract class ImageWriterAbstractTest<T extends ImageWriter> {
         return getTestData().get(index);
     }
 
-    protected URL getClassLoaderResource(final String name) {
-        return getClass().getResource(name);
+    protected URL getClassLoaderResource(final String pName) {
+        return getClass().getResource(pName);
     }
 
     @Test

imageio/imageio-hdr/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-hdr</artifactId>
     <name>TwelveMonkeys :: ImageIO :: HDR plugin</name>
@@ -32,21 +32,4 @@
             <artifactId>imageio-metadata</artifactId>
         </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
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

imageio/imageio-hdr/src/main/java/com/twelvemonkeys/imageio/plugins/hdr/HDRImageReader.java

@@ -59,7 +59,7 @@ public final class HDRImageReader extends ImageReaderBase {
 
     private HDRHeader header;
 
-    HDRImageReader(final ImageReaderSpi provider) {
+    protected HDRImageReader(final ImageReaderSpi provider) {
         super(provider);
     }
 
@@ -196,7 +196,7 @@ public final class HDRImageReader extends ImageReaderBase {
         int ySub = param != null ? param.getSourceYSubsampling() : 1;
 
         byte[] rowRGBE = new byte[width * 4];
-        byte[] pixelRGBE = new byte[4];
+        byte[] pixelRGBE = new byte[width];
 
         processImageStarted(imageIndex);
 
@@ -231,7 +231,7 @@ public final class HDRImageReader extends ImageReaderBase {
 
         processImageComplete();
 
-        return raster;
+        return destination.getRaster();
     }
 
     @Override

imageio/imageio-hdr/src/main/java/com/twelvemonkeys/imageio/plugins/hdr/HDRMetadata.java

@@ -5,7 +5,7 @@ import com.twelvemonkeys.imageio.StandardImageMetadataSupport;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.metadata.IIOMetadataNode;
 
-final class HDRMetadata extends StandardImageMetadataSupport {
+public class HDRMetadata extends StandardImageMetadataSupport {
     public HDRMetadata(ImageTypeSpecifier type, HDRHeader header) {
         super(builder(type)
                       .withCompressionTypeName("RLE")

imageio/imageio-icns/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-icns</artifactId>
     <name>TwelveMonkeys :: ImageIO :: ICNS 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>

imageio/imageio-iff/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-iff</artifactId>
     <name>TwelveMonkeys :: ImageIO :: IFF plugin</name>
@@ -29,23 +29,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>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-jpeg-jai-interop</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JPEG/JAI TIFF Interop</name>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-jpeg-jep262-interop</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JPEG/JEP-262 Interop</name>

imageio/imageio-jpeg/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-jpeg</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JPEG plugin</name>
@@ -32,23 +32,4 @@
             <artifactId>imageio-metadata</artifactId>
         </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>

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

@@ -145,8 +145,8 @@ final class HuffmanTable extends Segment {
             }
 
             int c = temp >> 4;
-            if (c > 1) {
-                throw new IIOException("Unexpected JPEG Huffman Table class (> 1): " + c);
+            if (c > 2) {
+                throw new IIOException("Unexpected JPEG Huffman Table class (> 2): " + c);
             }
 
             table.tc[t][c] = true;

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

@@ -888,21 +888,20 @@ public final class JPEGImageReader extends ImageReaderBase {
         throw new IIOException("No SOF segment in stream");
     }
 
-    private Application lastAppSegment(int marker, String identifier) throws IOException {
-        List<Application> appSegments = getAppSegments(marker, identifier);
-        return appSegments.isEmpty() ? null : appSegments.get(appSegments.size() - 1);
-    }
-
     AdobeDCT getAdobeDCT() throws IOException {
-        return (AdobeDCT) lastAppSegment(JPEG.APP14, "Adobe");
+        List<Application> adobe = getAppSegments(JPEG.APP14, "Adobe");
+        return adobe.isEmpty() ? null : (AdobeDCT) adobe.get(0);
     }
 
     JFIF getJFIF() throws IOException{
-        return (JFIF) lastAppSegment(JPEG.APP0, "JFIF");
+        List<Application> jfif = getAppSegments(JPEG.APP0, "JFIF");
+        return jfif.isEmpty() ? null : (JFIF) jfif.get(0);
+
     }
 
     JFXX getJFXX() throws IOException {
-        return (JFXX) lastAppSegment(JPEG.APP0, "JFXX");
+        List<Application> jfxx = getAppSegments(JPEG.APP0, "JFXX");
+        return jfxx.isEmpty() ? null : (JFXX) jfxx.get(0);
     }
 
     private EXIF getExif() throws IOException {

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

@@ -52,7 +52,7 @@ import static com.twelvemonkeys.imageio.util.IIOUtil.lookupProviderByName;
  * @version $Id: JPEGImageReaderSpi.java,v 1.0 24.01.11 22.12 haraldk Exp$
  */
 public final class JPEGImageReaderSpi extends ImageReaderSpiBase {
-    ImageReaderSpi delegateProvider;
+    protected ImageReaderSpi delegateProvider;
 
     /**
      * Constructor for use by {@link javax.imageio.spi.IIORegistry} only.

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

@@ -32,21 +32,19 @@ package com.twelvemonkeys.imageio.plugins.jpeg;
 
 import com.twelvemonkeys.imageio.ImageWriterBase;
 import com.twelvemonkeys.imageio.metadata.jpeg.JPEG;
-import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
 import com.twelvemonkeys.imageio.util.ProgressListenerBase;
 
-import org.w3c.dom.NodeList;
-
 import javax.imageio.IIOImage;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.event.IIOWriteWarningListener;
-import javax.imageio.metadata.IIOInvalidTreeException;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataNode;
 import java.awt.*;
-import java.awt.color.*;
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_ColorSpace;
+import java.awt.color.ICC_Profile;
 import java.awt.image.*;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -163,7 +161,7 @@ public final class JPEGImageWriter extends ImageWriterBase {
         else {
             // If the image metadata is our substitute, convert it back to native com.sun format
             if (image.getMetadata() instanceof JPEGImage10Metadata) {
-                ImageTypeSpecifier type = image.hasRaster() ? null : ImageTypeSpecifiers.createFromRenderedImage(image.getRenderedImage());
+                ImageTypeSpecifier type = image.hasRaster() ? null : ImageTypeSpecifier.createFromRenderedImage(image.getRenderedImage());
                 IIOMetadata nativeMetadata = delegate.getDefaultImageMetadata(type, param);
 
                 JPEGImage10Metadata metadata = (JPEGImage10Metadata) image.getMetadata();
@@ -186,67 +184,23 @@ public final class JPEGImageWriter extends ImageWriterBase {
         RenderedImage renderedImage = image.getRenderedImage();
         boolean overrideDestination = param != null && param.getDestinationType() != null;
         ImageTypeSpecifier destinationType = overrideDestination
-                ? param.getDestinationType()
-                : ImageTypeSpecifiers.createFromRenderedImage(renderedImage);
+                                             ? param.getDestinationType()
+                                             : ImageTypeSpecifier.createFromRenderedImage(renderedImage);
 
-        IIOMetadata metadata = convertCMYKMetadata(image.getMetadata(), destinationType, param);
+        ColorSpace cmykCS = destinationType.getColorModel().getColorSpace();
 
-        Raster raster = new InvertedRaster(getRaster(renderedImage));
+        IIOMetadata metadata = delegate.getDefaultImageMetadata(destinationType, param);
 
-        // TODO: For YCCK we need oposite conversion
-//            for (int i = 0; i < data.length; i += 4) {
-//                YCbCrConverter.convertYCbCr2RGB(data, data, i);
-//            }
-
-        if (overrideDestination) {
-            // Avoid javax.imageio.IIOException: Invalid argument to native writeImage
-            param.setDestinationType(null);
-        }
-
-        try {
-            delegate.write(streamMetadata, new IIOImage(raster, null, metadata), param);
-        }
-        finally {
-            if (overrideDestination) {
-                param.setDestinationType(destinationType);
-            }
-        }
-    }
-
-    private IIOMetadata convertCMYKMetadata(IIOMetadata original, ImageTypeSpecifier destinationType, ImageWriteParam param) throws IIOInvalidTreeException {
         IIOMetadataNode jpegMeta = new IIOMetadataNode(JAVAX_IMAGEIO_JPEG_IMAGE_1_0);
-        jpegMeta.appendChild(new IIOMetadataNode("JPEGVariety")); // Just leave as default, we can't write JFIF
+        jpegMeta.appendChild(new IIOMetadataNode("JPEGVariety")); // Just leave as default
 
         IIOMetadataNode markerSequence = new IIOMetadataNode("markerSequence");
         jpegMeta.appendChild(markerSequence);
 
-        IIOMetadataNode originalTree = original != null
-                ? (IIOMetadataNode) original.getAsTree(JAVAX_IMAGEIO_JPEG_IMAGE_1_0)
-                : new IIOMetadataNode("emptyNode");
-
-        // Append original unknown nodes, if present, but filter out any ICC Profiles
-        NodeList unknowns = originalTree.getElementsByTagName("unknown");
-        for (int i = 0; i < unknowns.getLength(); i++) {
-            IIOMetadataNode unknown = (IIOMetadataNode) unknowns.item(i);
-
-            // TODO: If the cmykCS is not an ICC profile, maybe it makes sense to NOT filter here? that's a corner case...
-            if ("226".equals(unknown.getAttribute("MarkerTag"))) {
-                Object userObject = unknown.getUserObject();
-
-                if (userObject instanceof byte[] && ((byte[]) userObject).length >= "ICC_PROFILE".length()
-                        && "ICC_PROFILE".equals(new String((byte[]) userObject, 0, "ICC_PROFILE".length()))) {
-                    continue;
-                }
-            }
-
-            markerSequence.appendChild(unknown);
-        }
-
         IIOMetadataNode app14Adobe = new IIOMetadataNode("app14Adobe");
         app14Adobe.setAttribute("transform", "0"); // 0 for CMYK, 2 for YCCK
         markerSequence.appendChild(app14Adobe);
 
-        ColorSpace cmykCS = destinationType.getColorModel().getColorSpace();
         if (cmykCS instanceof ICC_ColorSpace) {
             ICC_Profile profile = ((ICC_ColorSpace) cmykCS).getProfile();
             byte[] profileData = profile.getData();
@@ -279,16 +233,28 @@ public final class JPEGImageWriter extends ImageWriterBase {
             }
         }
 
-        // Append original comment nodes, if present
-        NodeList comments = originalTree.getElementsByTagName("COM");
-        for (int i = 0; i < comments.getLength(); i++) {
-            markerSequence.appendChild(comments.item(i));
-        }
-
-        IIOMetadata metadata = delegate.getDefaultImageMetadata(destinationType, param);
         metadata.mergeTree(JAVAX_IMAGEIO_JPEG_IMAGE_1_0, jpegMeta);
 
-        return metadata;
+        Raster raster = new InvertedRaster(getRaster(renderedImage));
+
+        // TODO: For YCCK we need oposite conversion
+//            for (int i = 0; i < data.length; i += 4) {
+//                YCbCrConverter.convertYCbCr2RGB(data, data, i);
+//            }
+
+        if (overrideDestination) {
+            // Avoid javax.imageio.IIOException: Invalid argument to native writeImage
+            param.setDestinationType(null);
+        }
+
+        try {
+            delegate.write(streamMetadata, new IIOImage(raster, null, metadata), param);
+        }
+        finally {
+            if (overrideDestination) {
+                param.setDestinationType(destinationType);
+            }
+        }
     }
 
     // TODO: Candidate util method

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

@@ -38,13 +38,7 @@ import com.twelvemonkeys.imageio.util.ImageWriterAbstractTest;
 import org.junit.Test;
 import org.w3c.dom.NodeList;
 
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
+import javax.imageio.*;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;
@@ -54,7 +48,8 @@ import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
 import javax.imageio.stream.MemoryCacheImageOutputStream;
 import java.awt.*;
-import java.awt.color.*;
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_Profile;
 import java.awt.image.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -216,7 +211,7 @@ public class JPEGImageWriterTest extends ImageWriterAbstractTest<JPEGImageWriter
         // Test APP2/ICC_PROFILE segments form native metadata
         IIOMetadataNode nativeMeta = (IIOMetadataNode) metadata.getAsTree(JPEGImage10Metadata.JAVAX_IMAGEIO_JPEG_IMAGE_1_0);
         NodeList unknown = nativeMeta.getElementsByTagName("unknown");
-        assertEquals(14, unknown.getLength()); // We write longer segments than the original, so we get less segments
+        assertEquals(11, unknown.getLength()); // We write longer segments than the original, so we get less segments
 
         ByteArrayOutputStream iccSegments = new ByteArrayOutputStream(1024 * 1024);
 
@@ -243,6 +238,7 @@ public class JPEGImageWriterTest extends ImageWriterAbstractTest<JPEGImageWriter
         ImageWriter writer = createWriter();
         ImageReader reader = ImageIO.getImageReader(writer);
 
+        // TODO: Add flag to allow removing the ICC profile from image
         ByteArrayOutputStream stream = transcode(reader, getClassLoaderResource("/jpeg/cmyk-sample-multiple-chunk-icc.jpg"), writer, ColorSpace.TYPE_CMYK, false);
 
         reader.reset();
@@ -263,7 +259,7 @@ public class JPEGImageWriterTest extends ImageWriterAbstractTest<JPEGImageWriter
         // Test APP2/ICC_PROFILE segments form native metadata
         IIOMetadataNode nativeMeta = (IIOMetadataNode) metadata.getAsTree(JPEGImage10Metadata.JAVAX_IMAGEIO_JPEG_IMAGE_1_0);
         NodeList unknown = nativeMeta.getElementsByTagName("unknown");
-        assertEquals(3, unknown.getLength());
+        assertEquals(0, unknown.getLength());
     }
 
     // TODO: YCCK

imageio/imageio-metadata/pom.xml

@@ -3,13 +3,13 @@
     <parent>
 	<groupId>com.twelvemonkeys.imageio</groupId>
 	<artifactId>imageio</artifactId>        
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>imageio-metadata</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Metadata</name>
     <description>
-        TwelveMonkeys ImageIO metadata support classes.
+        ImageIO metadata module.
     </description>
 
     <properties>
@@ -28,13 +28,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

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

@@ -88,7 +88,7 @@ public interface JPEG {
     // Start of Frame segment markers (SOFn).
     /** SOF0: Baseline DCT, Huffman coding. */
     int SOF0 = 0xFFC0;
-    /** SOF1: Extended DCT, Huffman coding. */
+    /** SOF0: Extended DCT, Huffman coding. */
     int SOF1 = 0xFFC1;
     /** SOF2: Progressive DCT, Huffman coding. */
     int SOF2 = 0xFFC2;

imageio/imageio-pcx/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-pcx</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PCX plugin</name>
@@ -28,21 +28,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
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

imageio/imageio-pdf/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-pdf</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PDF plugin</name>
@@ -28,13 +28,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

imageio/imageio-pict/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-pict</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PICT plugin</name>
@@ -27,22 +27,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.ImageReaderSpi,
-                            osgi.serviceloader;
-                            osgi.serviceloader=javax.imageio.spi.ImageWriterSpi
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

imageio/imageio-pnm/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-pnm</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PNM plugin</name>
@@ -28,23 +28,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>

imageio/imageio-psd/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-psd</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PSD plugin</name>
@@ -31,23 +31,4 @@
             <artifactId>imageio-metadata</artifactId>
         </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>

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

@@ -864,27 +864,21 @@ public final class PSDImageReader extends ImageReaderBase {
 
             long imageResourcesLength = imageInput.readUnsignedInt();
 
-            if (pParseData && metadata.imageResources == null) {
-                if (imageResourcesLength == 0) {
-                    metadata.imageResources = Collections.emptyList();
+            if (pParseData && metadata.imageResources == null && imageResourcesLength > 0) {
+                long expectedEnd = imageInput.getStreamPosition() + imageResourcesLength;
+                metadata.imageResources = new ArrayList<>();
+
+                while (imageInput.getStreamPosition() < expectedEnd) {
+                    PSDImageResource resource = PSDImageResource.read(imageInput);
+                    metadata.imageResources.add(resource);
                 }
-                else {
-                    metadata.imageResources = new ArrayList<>();
 
-                    long expectedEnd = imageInput.getStreamPosition() + imageResourcesLength;
+                if (DEBUG) {
+                    System.out.println("imageResources: " + metadata.imageResources);
+                }
 
-                    while (imageInput.getStreamPosition() < expectedEnd) {
-                        PSDImageResource resource = PSDImageResource.read(imageInput);
-                        metadata.imageResources.add(resource);
-                    }
-
-                    if (DEBUG) {
-                        System.out.println("imageResources: " + metadata.imageResources);
-                    }
-
-                    if (imageInput.getStreamPosition() != expectedEnd) {
-                        throw new IIOException("Corrupt PSD document"); // ..or maybe just a bug in the reader.. ;-)
-                    }
+                if (imageInput.getStreamPosition() != expectedEnd) {
+                    throw new IIOException("Corrupt PSD document"); // ..or maybe just a bug in the reader.. ;-)
                 }
             }
 
@@ -1070,7 +1064,7 @@ public final class PSDImageReader extends ImageReaderBase {
         final int height = getLayerHeight(layerIndex);
 
         // TODO: This behaviour must be documented!
-        // If layer has no pixel data, return null, as we can't create a 0 x 0 sample model/raster
+        // If layer has no pixel data, return null
         if (width <= 0 || height <= 0) {
             return null;
         }

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

@@ -47,7 +47,6 @@ import javax.imageio.stream.ImageInputStream;
 import java.awt.*;
 import java.awt.color.*;
 import java.awt.image.*;
-import java.io.EOFException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -696,30 +695,6 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
         }
     }
 
-    @Test(timeout = 1000)
-    public void testBrokenPackBitsThrowsEOFException() throws IOException {
-        PSDImageReader imageReader = createReader();
-
-        try (ImageInputStream stream = ImageIO.createImageInputStream(getClassLoaderResource("/broken-psd/short-packbits.psd"))) {
-            imageReader.setInput(stream);
-
-            assertEquals(1, imageReader.getNumImages(true));
-
-            assertEquals(427, imageReader.getWidth(0));
-            assertEquals(107, imageReader.getHeight(0));
-
-            try {
-                imageReader.read(0);
-
-                fail("Expected EOFException, is the test broken?");
-            }
-            catch (EOFException expected) {
-                assertTrue(expected.getMessage().contains("PackBits"));
-            }
-        }
-    }
-
-
     final static class FakeCMYKColorSpace extends ColorSpace {
         FakeCMYKColorSpace() {
             super(ColorSpace.TYPE_CMYK, 4);

imageio/imageio-reference/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-reference</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JDK Reference Tests</name>

imageio/imageio-sgi/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-sgi</artifactId>
     <name>TwelveMonkeys :: ImageIO :: SGI plugin</name>
@@ -28,21 +28,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
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

imageio/imageio-tga/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-tga</artifactId>
     <name>TwelveMonkeys :: ImageIO :: TGA plugin</name>
@@ -28,23 +28,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>

imageio/imageio-thumbsdb/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-thumbsdb</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Thumbs.db plugin</name>
@@ -28,21 +28,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
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-tiff-jai-interop</artifactId>
     <name>TwelveMonkeys :: ImageIO :: TIFF/JAI Metadata Interop</name>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-tiff-jdk-interop</artifactId>
     <name>TwelveMonkeys :: ImageIO :: TIFF/JDK JPEG Interop</name>

imageio/imageio-tiff/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-tiff</artifactId>
     <name>TwelveMonkeys :: ImageIO :: TIFF plugin</name>
@@ -30,11 +30,6 @@
             <artifactId>imageio-jpeg</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>imageio-webp</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
@@ -42,23 +37,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>

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/DelegateTileDecoder.java

@@ -1,99 +0,0 @@
-package com.twelvemonkeys.imageio.plugins.tiff;
-
-import javax.imageio.IIOException;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReader;
-import javax.imageio.event.IIOReadWarningListener;
-import javax.imageio.stream.ImageInputStream;
-import java.awt.*;
-import java.awt.image.*;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.function.Predicate;
-
-import static com.twelvemonkeys.lang.Validate.notNull;
-
-/**
- * DelegateTileDecoder.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: DelegateTileDecoder.java,v 1.0 09/11/2023 haraldk Exp$
- */
-class DelegateTileDecoder extends TileDecoder {
-
-    protected final ImageReader delegate;
-    protected final ImageReadParam param;
-
-    private final Predicate<ImageReader> needsRasterConversion;
-    private final RasterConverter converter;
-    private Boolean readRasterAndConvert;
-
-    DelegateTileDecoder(final IIOReadWarningListener warningListener, final String format, final ImageReadParam originalParam) throws IOException {
-        this(warningListener, createDelegate(format), originalParam, imageReader -> false, null);
-    }
-
-    DelegateTileDecoder(final IIOReadWarningListener warningListener, final String format, final ImageReadParam originalParam, final Predicate<ImageReader> needsRasterConversion, final RasterConverter converter) throws IOException {
-        this(warningListener, createDelegate(format), originalParam, needsRasterConversion, converter);
-    }
-
-    private DelegateTileDecoder(final IIOReadWarningListener warningListener, final ImageReader delegate, final ImageReadParam originalParam, final Predicate<ImageReader> needsRasterConversion, final RasterConverter converter) {
-        super(warningListener);
-
-        this.delegate = notNull(delegate, "delegate");
-        delegate.addIIOReadWarningListener(warningListener);
-
-        if (TIFFImageReader.DEBUG) {
-            System.out.println("tile reading delegate: " + delegate);
-        }
-
-        param = delegate.getDefaultReadParam();
-        param.setSourceSubsampling(originalParam.getSourceXSubsampling(), originalParam.getSourceYSubsampling(), 0, 0);
-
-        this.needsRasterConversion = needsRasterConversion;
-        this.converter = converter;
-    }
-
-    private static ImageReader createDelegate(String format) throws IOException {
-        // We'll just use the default (first) reader
-        // If it's the TwelveMonkeys one, we will be able to read JPEG Lossless etc.
-        Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName(format);
-        if (!readers.hasNext()) {
-            throw new IIOException("No ImageReader registered for '" + format + "' format");
-        }
-
-        return readers.next();
-    }
-
-    @Override
-    void decodeTile(final ImageInputStream input, final Rectangle sourceRegion, final Point destinationOffset, final BufferedImage destination) throws IOException {
-        delegate.setInput(input);
-        param.setSourceRegion(sourceRegion);
-
-        if (readRasterAndConvert == null) {
-            // All tiles in an image will use the same format, test once and cache result
-            readRasterAndConvert = needsRasterConversion.test(delegate);
-        }
-
-        if (!readRasterAndConvert) {
-            // No conversion needed
-            param.setDestinationOffset(destinationOffset);
-            param.setDestination(destination);
-            delegate.read(0, param);
-        }
-        else {
-            // Otherwise, it's likely CMYK or some other interpretation we don't need to convert.
-            // We'll have to use readAsRaster and later apply color space conversion ourselves
-            Raster raster = delegate.readRaster(0, param);
-            converter.convert(raster);
-
-            destination.getRaster().setDataElements(destinationOffset.x, destinationOffset.y, raster);
-        }
-    }
-
-    @Override
-    public void close() {
-        delegate.dispose();
-    }
-}

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/JPEGTables.java

@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2012, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.tiff;
+
+import com.twelvemonkeys.imageio.metadata.jpeg.JPEG;
+import com.twelvemonkeys.imageio.metadata.jpeg.JPEGQuality;
+import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegment;
+import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegmentUtil;
+
+import javax.imageio.IIOException;
+import javax.imageio.plugins.jpeg.JPEGHuffmanTable;
+import javax.imageio.plugins.jpeg.JPEGQTable;
+import javax.imageio.stream.ImageInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * JPEGTables
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: JPEGTables.java,v 1.0 11.05.12 09:13 haraldk Exp$
+ */
+class JPEGTables {
+    private static final int DHT_LENGTH = 16;
+    private static final Map<Integer, List<String>> SEGMENT_IDS = createSegmentIdsMap();
+
+    private JPEGQTable[] qTables;
+    private JPEGHuffmanTable[] dcHTables;
+    private JPEGHuffmanTable[] acHTables;
+
+    private static Map<Integer, List<String>> createSegmentIdsMap() {
+        Map<Integer, List<String>> segmentIds = new HashMap<Integer, List<String>>();
+        segmentIds.put(JPEG.DQT, null);
+        segmentIds.put(JPEG.DHT, null);
+
+        return Collections.unmodifiableMap(segmentIds);
+    }
+
+    private final List<JPEGSegment> segments;
+
+    public JPEGTables(ImageInputStream input) throws IOException {
+        segments = JPEGSegmentUtil.readSegments(input, SEGMENT_IDS);
+    }
+
+    public JPEGQTable[] getQTables() throws IOException {
+        if (qTables == null) {
+            qTables = JPEGQuality.getQTables(segments);
+        }
+
+        return qTables;
+    }
+
+    private void getHuffmanTables() throws IOException {
+        if (dcHTables == null || acHTables == null) {
+            List<JPEGHuffmanTable> dc = new ArrayList<JPEGHuffmanTable>();
+            List<JPEGHuffmanTable> ac = new ArrayList<JPEGHuffmanTable>();
+
+            // JPEG may contain multiple DHT marker segments
+            for (JPEGSegment segment : segments) {
+                if (segment.marker() != JPEG.DHT) {
+                    continue;
+                }
+
+                DataInputStream data = new DataInputStream(segment.data());
+                int read = 0;
+
+                // A single DHT marker segment may contain multiple tables
+                while (read < segment.length()) {
+                    int htInfo = data.read();
+                    read++;
+
+                    int num = htInfo & 0x0f; // 0-3
+                    int type = htInfo >> 4; // 0 == DC, 1 == AC
+
+                    if (type > 1) {
+                        throw new IIOException("Bad DHT type: " + type);
+                    }
+                    if (num >= 4) {
+                        throw new IIOException("Bad DHT table index: " + num);
+                    }
+                    else if (type == 0 ? dc.size() > num : ac.size() > num) {
+                        throw new IIOException("Duplicate DHT table index: " + num);
+                    }
+
+                    // Read lengths as short array
+                    short[] lengths = new short[DHT_LENGTH];
+                    for (int i = 0; i < DHT_LENGTH; i++) {
+                        lengths[i] = (short) data.readUnsignedByte();
+                    }
+                    read += lengths.length;
+
+                    int sum = 0;
+                    for (short length : lengths) {
+                        sum += length;
+                    }
+
+                    // Expand table to short array
+                    short[] table = new short[sum];
+                    for (int j = 0; j < sum; j++) {
+                        table[j] = (short) data.readUnsignedByte();
+                    }
+
+                    JPEGHuffmanTable hTable = new JPEGHuffmanTable(lengths, table);
+                    if (type == 0) {
+                        dc.add(num, hTable);
+                    }
+                    else {
+                        ac.add(num, hTable);
+                    }
+
+                    read += sum;
+                }
+            }
+
+            dcHTables = dc.toArray(new JPEGHuffmanTable[dc.size()]);
+            acHTables = ac.toArray(new JPEGHuffmanTable[ac.size()]);
+        }
+    }
+
+    public JPEGHuffmanTable[] getDCHuffmanTables() throws IOException {
+        getHuffmanTables();
+        return dcHTables;
+    }
+
+    public JPEGHuffmanTable[] getACHuffmanTables() throws IOException {
+        getHuffmanTables();
+        return acHTables;
+    }
+}

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/JPEGTileDecoder.java

@@ -1,37 +0,0 @@
-package com.twelvemonkeys.imageio.plugins.tiff;
-
-import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
-
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReader;
-import javax.imageio.event.IIOReadWarningListener;
-import java.io.IOException;
-import java.util.function.Predicate;
-
-/**
- * JPEGTileDecoder.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: JPEGTileDecoder.java,v 1.0 09/11/2023 haraldk Exp$
- */
-final class JPEGTileDecoder extends DelegateTileDecoder {
-    JPEGTileDecoder(final IIOReadWarningListener warningListener, final int compression, final byte[] jpegTables, final int numTiles, final ImageReadParam originalParam, final Predicate<ImageReader> needsConversion, final RasterConverter converter) throws IOException {
-        super(warningListener, "JPEG", originalParam, needsConversion, converter);
-
-        if (jpegTables != null) {
-            // This initializes the tables and other internal settings for the reader,
-            // and is actually a feature of JPEG, see "abbreviated streams":
-            // http://docs.oracle.com/javase/6/docs/api/javax/imageio/metadata/doc-files/jpeg_metadata.html#abbrev
-            delegate.setInput(new ByteArrayImageInputStream(jpegTables));
-            delegate.getStreamMetadata();
-        }
-        else if (numTiles > 1) {
-            // TODO: This is not really a problem as long as we read ALL tiles, but we can't have random access in this case...
-            if (compression == TIFFExtension.COMPRESSION_JPEG) {
-                warningListener.warningOccurred(delegate, "Missing JPEGTables for tiled/striped TIFF with compression: 7 (JPEG)");
-            }
-            // ...and the JPEG reader might choke on missing tables...
-        }
-    }
-}

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFCustom.java

@@ -54,8 +54,6 @@ interface TIFFCustom {
     int COMPRESSION_JPEG2000 = 34712;
     // TODO: Aperio SVS JPEG2000: 33003 (YCbCr) and 33005 (RGB), see http://openslide.org/formats/aperio/
 
-    int COMPRESSION_WEBP = 50001;
-
     // PIXTIFF aka DELL PixTools, see https://community.emc.com/message/515755#515755
     /** PIXTIFF proprietary ZIP compression, identical to Deflate/ZLib. */
     int COMPRESSION_PIXTIFF_ZIP = 50013;

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java

@@ -40,7 +40,6 @@ import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
 import com.twelvemonkeys.imageio.metadata.tiff.TIFFWriter;
 import com.twelvemonkeys.imageio.stream.SubImageOutputStream;
 import com.twelvemonkeys.imageio.util.IIOUtil;
-import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
 import com.twelvemonkeys.imageio.util.ProgressListenerBase;
 import com.twelvemonkeys.io.enc.EncoderStream;
 import com.twelvemonkeys.io.enc.PackBitsEncoder;
@@ -150,9 +149,9 @@ public final class TIFFImageWriter extends ImageWriterBase {
         RenderedImage renderedImage = image.getRenderedImage();
         SampleModel sampleModel = renderedImage.getSampleModel();
 
-        // Need ImageTypeSpecifiers.createFromRenderedImage in this case, as the JDK method does not consider
-        // palette for TYPE_BYTE_BINARY/TYPE_BYTE_INDEXED...
-        ImageTypeSpecifier spec = ImageTypeSpecifiers.createFromRenderedImage(renderedImage);
+        // Can't use createFromRenderedImage in this case, as it does not consider palette for TYPE_BYTE_BINARY...
+        // TODO: Consider writing workaround in ImageTypeSpecifiers
+        ImageTypeSpecifier spec = new ImageTypeSpecifier(renderedImage);
 
         // TODO: Handle case where convertImageMetadata returns null, due to unknown metadata format, or reconsider if that's a valid case...
         TIFFImageMetadata metadata = image.getMetadata() != null
@@ -250,7 +249,7 @@ public final class TIFFImageWriter extends ImageWriterBase {
                 ListenerDelegate listener = new ListenerDelegate(imageIndex);
                 jpegWriter.addIIOWriteProgressListener(listener);
                 jpegWriter.addIIOWriteWarningListener(listener);
-                jpegWriter.write(null, imageOnly(image), copyParams(param, jpegWriter));
+                jpegWriter.write(null, image, copyParams(param, jpegWriter));
             }
             finally {
                 jpegWriter.dispose();
@@ -285,17 +284,6 @@ public final class TIFFImageWriter extends ImageWriterBase {
         return nextIFDPointerOffset;
     }
 
-    private IIOImage imageOnly(final IIOImage image) {
-        if (image.getMetadata() == null && image.getNumThumbnails() == 0) {
-            // Just image data here, no need to copy
-            return image;
-        }
-
-        return image.hasRaster()
-                ? new IIOImage(image.getRaster(), null, null)
-                : new IIOImage(image.getRenderedImage(), null, null);
-    }
-
     // TODO: Candidate util method
     private ImageWriteParam copyParams(final ImageWriteParam param, final ImageWriter writer) {
         if (param == null) {

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TileDecoder.java

@@ -1,34 +0,0 @@
-package com.twelvemonkeys.imageio.plugins.tiff;
-
-import javax.imageio.event.IIOReadWarningListener;
-import javax.imageio.stream.ImageInputStream;
-import java.awt.*;
-import java.awt.image.*;
-import java.io.IOException;
-
-import static com.twelvemonkeys.lang.Validate.notNull;
-
-/**
- * TileDecoder.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: TileDecoder.java,v 1.0 09/11/2023 haraldk Exp$
- */
-abstract class TileDecoder implements AutoCloseable {
-
-    protected final IIOReadWarningListener warningListener;
-
-    public TileDecoder(IIOReadWarningListener warningListener) {
-        this.warningListener = notNull(warningListener, "warningListener");
-    }
-
-    abstract void decodeTile(ImageInputStream input, Rectangle sourceRegion, Point destinationOffset, BufferedImage destination) throws IOException;
-
-    @Override
-    public abstract void close();
-
-    interface RasterConverter {
-        void convert(Raster raster) throws IOException;
-    }
-}

imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadataTest.java

@@ -29,19 +29,14 @@
  */
 package com.twelvemonkeys.imageio.plugins.tiff;
 
-import com.twelvemonkeys.imageio.metadata.Directory;
-import com.twelvemonkeys.imageio.metadata.Entry;
-import com.twelvemonkeys.imageio.metadata.tiff.Rational;
-import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
-import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
-import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
-import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
-import com.twelvemonkeys.lang.StringUtil;
+import static com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME;
+import static org.junit.Assert.*;
 
-import org.junit.Test;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.imageio.ImageIO;
 import javax.imageio.metadata.IIOInvalidTreeException;
@@ -50,14 +45,20 @@ import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;
 import javax.imageio.spi.IIORegistry;
 import javax.imageio.stream.ImageInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
 
-import static com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME;
-import static org.junit.Assert.*;
+import org.junit.Test;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.twelvemonkeys.imageio.metadata.Directory;
+import com.twelvemonkeys.imageio.metadata.Entry;
+import com.twelvemonkeys.imageio.metadata.tiff.Rational;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
+import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
+import com.twelvemonkeys.lang.StringUtil;
 
 /**
  * TIFFImageMetadataTest.
@@ -304,7 +305,7 @@ public class TIFFImageMetadataTest {
 
     @Test
     public void testMergeTreeStandardFormat() throws IOException {
-        TIFFImageMetadata metadata = (TIFFImageMetadata) createMetadata("/tiff/old-style-jpeg-zackthecat.tif");
+        TIFFImageMetadata metadata = (TIFFImageMetadata) createMetadata("/tiff/zackthecat.tif");
 
         String standardFormat = IIOMetadataFormatImpl.standardMetadataFormatName;
 

imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java

@@ -94,7 +94,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
                 new TestData(getClassLoaderResource("/tiff/ycbcr-cat.tif"), new Dimension(250, 325)), // YCbCr, LZW compressed
                 new TestData(getClassLoaderResource("/tiff/quad-jpeg.tif"), new Dimension(512, 384)), // YCbCr, JPEG compressed, striped
                 new TestData(getClassLoaderResource("/tiff/smallliz.tif"), new Dimension(160, 160)), // YCbCr, Old-Style JPEG compressed (full JFIF stream)
-                new TestData(getClassLoaderResource("/tiff/old-style-jpeg-zackthecat.tif"), new Dimension(234, 213)), // YCbCr, Old-Style JPEG compressed (tables, no JFIF stream)
+                new TestData(getClassLoaderResource("/tiff/zackthecat.tif"), new Dimension(234, 213)), // YCbCr, Old-Style JPEG compressed (tables, no JFIF stream)
                 new TestData(getClassLoaderResource("/tiff/test-single-gray-compression-type-2.tiff"), new Dimension(1728, 1146)), // Gray, CCITT type 2 compressed
                 new TestData(getClassLoaderResource("/tiff/cramps-tile.tif"), new Dimension(800, 607)), // Gray/WhiteIsZero, uncompressed, striped & tiled...
                 new TestData(getClassLoaderResource("/tiff/lzw-long-strings-sample.tif"), new Dimension(316, 173)), // RGBA, LZW compressed w/predictor
@@ -191,9 +191,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
                 new TestData(getClassLoaderResource("/tiff/planar-yuv420-jpeg-uncompressed.tif"), new Dimension(256, 64)), // YCbCr, JPEG coefficients, uncompressed, striped
                 new TestData(getClassLoaderResource("/tiff/planar-yuv420-jpeg-lzw.tif"), new Dimension(256, 64)), // YCbCr, JPEG coefficients,LZW compressed, striped
                 new TestData(getClassLoaderResource("/tiff/planar-yuv410-jpeg-uncompressed.tif"), new Dimension(256, 64)), // YCbCr, JPEG coefficients, uncompressed, striped
-                new TestData(getClassLoaderResource("/tiff/planar-yuv410-jpeg-lzw.tif"), new Dimension(256, 64)), // YCbCr, JPEG coefficients,LZW compressed, striped
-                // WebP compressed
-                new TestData(getClassLoaderResource("/tiff/webp_lossless_rgba_alpha_fully_opaque.tif"), new Dimension(20, 20)) // RGBA, WebP lossless
+                new TestData(getClassLoaderResource("/tiff/planar-yuv410-jpeg-lzw.tif"), new Dimension(256, 64)) // YCbCr, JPEG coefficients,LZW compressed, striped
         );
     }
 
@@ -370,7 +368,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
 
     @Test
     public void testReadOldStyleWangMultiStrip2() throws IOException {
-        TestData testData = new TestData(getClassLoaderResource("/tiff/old-style-jpeg-662260-color.tif"), new Dimension(1600, 1200));
+        TestData testData = new TestData(getClassLoaderResource("/tiff/662260-color.tif"), new Dimension(1600, 1200));
 
         try (ImageInputStream stream = testData.getInputStream()) {
             TIFFImageReader reader = createReader();
@@ -384,7 +382,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
             assertNotNull(image);
             assertEquals(testData.getDimension(0), new Dimension(image.getWidth(), image.getHeight()));
             verify(warningListener, atLeastOnce()).warningOccurred(eq(reader), and(contains("Old-style JPEG"), contains("tables")));
-            verify(warningListener, atLeastOnce()).warningOccurred(eq(reader), and(contains("Incorrect StripByteCounts/TileByteCounts"), contains("JPEGInterchangeFormatLength")));
+            verify(warningListener, atLeastOnce()).warningOccurred(eq(reader), and(contains("Incorrect StripOffsets/TileOffsets"), contains("SOS marker")));
         }
     }
 

imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterTest.java

@@ -34,7 +34,6 @@ import com.twelvemonkeys.imageio.metadata.Directory;
 import com.twelvemonkeys.imageio.metadata.Entry;
 import com.twelvemonkeys.imageio.metadata.tiff.Rational;
 import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
-import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
 import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
 import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
 import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
@@ -74,8 +73,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.twelvemonkeys.imageio.metadata.tiff.TIFF.TAG_X_RESOLUTION;
-import static com.twelvemonkeys.imageio.metadata.tiff.TIFF.TAG_Y_RESOLUTION;
 import static com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME;
 import static com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadataTest.createTIFFFieldNode;
 import static com.twelvemonkeys.imageio.util.ImageReaderAbstractTest.assertRGBEquals;
@@ -136,8 +133,8 @@ public class TIFFImageWriterTest extends ImageWriterAbstractTest<TIFFImageWriter
             customMeta.appendChild(ifd);
 
             createTIFFFieldNode(ifd, TIFF.TAG_RESOLUTION_UNIT, TIFF.TYPE_SHORT, resolutionUnitValue);
-            createTIFFFieldNode(ifd, TAG_X_RESOLUTION, TIFF.TYPE_RATIONAL, resolutionValue);
-            createTIFFFieldNode(ifd, TAG_Y_RESOLUTION, TIFF.TYPE_RATIONAL, resolutionValue);
+            createTIFFFieldNode(ifd, TIFF.TAG_X_RESOLUTION, TIFF.TYPE_RATIONAL, resolutionValue);
+            createTIFFFieldNode(ifd, TIFF.TAG_Y_RESOLUTION, TIFF.TYPE_RATIONAL, resolutionValue);
 
             metadata.mergeTree(nativeFormat, customMeta);
 
@@ -156,11 +153,11 @@ public class TIFFImageWriterTest extends ImageWriterAbstractTest<TIFFImageWriter
         assertNotNull(resolutionUnit);
         assertEquals(resolutionUnitValue, ((Number) resolutionUnit.getValue()).intValue());
 
-        Entry xResolution = ifds.getEntryById(TAG_X_RESOLUTION);
+        Entry xResolution = ifds.getEntryById(TIFF.TAG_X_RESOLUTION);
         assertNotNull(xResolution);
         assertEquals(resolutionValue, xResolution.getValue());
 
-        Entry yResolution = ifds.getEntryById(TAG_Y_RESOLUTION);
+        Entry yResolution = ifds.getEntryById(TIFF.TAG_Y_RESOLUTION);
         assertNotNull(yResolution);
         assertEquals(resolutionValue, yResolution.getValue());
     }
@@ -275,11 +272,11 @@ public class TIFFImageWriterTest extends ImageWriterAbstractTest<TIFFImageWriter
         assertNotNull(resolutionUnit);
         assertEquals(resolutionUnitValue, ((Number) resolutionUnit.getValue()).intValue());
 
-        Entry xResolution = ifds.getEntryById(TAG_X_RESOLUTION);
+        Entry xResolution = ifds.getEntryById(TIFF.TAG_X_RESOLUTION);
         assertNotNull(xResolution);
         assertEquals(expectedResolutionValue, xResolution.getValue());
 
-        Entry yResolution = ifds.getEntryById(TAG_Y_RESOLUTION);
+        Entry yResolution = ifds.getEntryById(TIFF.TAG_Y_RESOLUTION);
         assertNotNull(yResolution);
         assertEquals(expectedResolutionValue, yResolution.getValue());
     }
@@ -1307,79 +1304,6 @@ public class TIFFImageWriterTest extends ImageWriterAbstractTest<TIFFImageWriter
         }
     }
 
-    @Test
-    public void testWriteBinaryWhiteIsZero() throws IOException {
-        IndexColorModel whiteIsZero = new IndexColorModel(1, 2, new int[] {-1, 0}, 0, false, -1, DataBuffer.TYPE_BYTE);
-        BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_BYTE_BINARY, whiteIsZero);
-
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-        try (ImageOutputStream output = ImageIO.createImageOutputStream(bytes)) {
-            ImageWriter imageWriter = createWriter();
-            imageWriter.setOutput(output);
-            imageWriter.write(image);
-        }
-
-        Directory directory = new TIFFReader().read(new ByteArrayImageInputStream(bytes.toByteArray()));
-
-        assertNotNull(directory.getEntryById(TIFF.TAG_PHOTOMETRIC_INTERPRETATION));
-        assertEquals(TIFFBaseline.PHOTOMETRIC_WHITE_IS_ZERO, directory.getEntryById(TIFF.TAG_PHOTOMETRIC_INTERPRETATION).getValue());
-    }
-
-    @Test
-    public void testWriteBinaryBlackIsZero() throws IOException {
-        IndexColorModel blackIsZero = new IndexColorModel(1, 2, new int[] {0, -1}, 0, false, -1, DataBuffer.TYPE_BYTE);
-        BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_BYTE_BINARY, blackIsZero);
-
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-        try (ImageOutputStream output = ImageIO.createImageOutputStream(bytes)) {
-            ImageWriter imageWriter = createWriter();
-            imageWriter.setOutput(output);
-            imageWriter.write(image);
-        }
-
-        Directory directory = new TIFFReader().read(new ByteArrayImageInputStream(bytes.toByteArray()));
-
-        assertNotNull(directory.getEntryById(TIFF.TAG_PHOTOMETRIC_INTERPRETATION));
-        assertEquals(TIFFBaseline.PHOTOMETRIC_BLACK_IS_ZERO, directory.getEntryById(TIFF.TAG_PHOTOMETRIC_INTERPRETATION).getValue());
-    }
-
-    @Test
-    public void testWriteBinaryPalette() throws IOException {
-        IndexColorModel redAndBluePalette = new IndexColorModel(1, 2, new int[] {0xFF00FF00, 0xFF0000FF}, 0, false, -1, DataBuffer.TYPE_BYTE);
-        BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_BYTE_BINARY, redAndBluePalette);
-
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-        try (ImageOutputStream output = ImageIO.createImageOutputStream(bytes)) {
-            ImageWriter imageWriter = createWriter();
-            imageWriter.setOutput(output);
-            imageWriter.write(image);
-        }
-
-        Directory directory = new TIFFReader().read(new ByteArrayImageInputStream(bytes.toByteArray()));
-
-        assertNotNull(directory.getEntryById(TIFF.TAG_PHOTOMETRIC_INTERPRETATION));
-        assertEquals(TIFFBaseline.PHOTOMETRIC_PALETTE, directory.getEntryById(TIFF.TAG_PHOTOMETRIC_INTERPRETATION).getValue());
-    }
-
-    @Test
-    public void testWriteJPEGCompressedShouldNotPassMetadata() throws IOException {
-        BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
-
-        try (ImageOutputStream output = new NullImageOutputStream()) {
-            ImageWriter imageWriter = createWriter();
-            imageWriter.setOutput(output);
-
-            ImageWriteParam param = imageWriter.getDefaultWriteParam();
-            param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-            param.setCompressionType("JPEG");
-
-            // From #815
-            // Prior to fix, this would throw IIOException: Metadata components != number of destination bands
-            // (empty metadata defaults to 1 channel gray, while image data is 3 channel BGR)
-            imageWriter.write(null, new IIOImage(image, null, new TIFFImageMetadata()), param);
-        }
-    }
-
     @Test
     public void testShortOverflowHuge() throws IOException {
         int width = 34769;

imageio/imageio-webp/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-webp</artifactId>
     <name>TwelveMonkeys :: ImageIO :: WebP plugin</name>
@@ -31,21 +31,4 @@
             <type>test-jar</type>
         </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
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/WebPImageReader.java

@@ -77,11 +77,6 @@ final class WebPImageReader extends ImageReaderBase {
     // Either VP8_, VP8L or VP8X chunk
     private long fileSize;
     private VP8xChunk header;
-
-    // The ICC Profile contained in the stream, only suitable for metadata.
-    private ICC_Profile containedICCP;
-
-    // A safe, verified RGB ICC Profile used for color conversion.
     private ICC_Profile iccProfile;
     private final List<AnimationFrame> frames = new ArrayList<>();
 
@@ -93,7 +88,6 @@ final class WebPImageReader extends ImageReaderBase {
     protected void resetMembers() {
         fileSize = -1;
         header = null;
-        containedICCP = null;
         iccProfile = null;
         lsbBitReader = null;
         frames.clear();
@@ -305,20 +299,13 @@ final class WebPImageReader extends ImageReaderBase {
 
                 if (header.containsICCP) {
                     // ICCP chunk must be first chunk, if present
-                    while (containedICCP == null && imageInput.getStreamPosition() < fileSize) {
+                    while (iccProfile == null && imageInput.getStreamPosition() < fileSize) {
                         int nextChunk = imageInput.readInt();
                         long chunkLength = imageInput.readUnsignedInt();
                         long chunkStart = imageInput.getStreamPosition();
 
                         if (nextChunk == WebP.CHUNK_ICCP) {
-                            containedICCP = ColorProfiles.readProfile(IIOUtil.createStreamAdapter(imageInput, chunkLength));
-
-                            if (containedICCP.getColorSpaceType() == ColorSpace.TYPE_RGB) {
-                                iccProfile = containedICCP;
-                            }
-                            else {
-                                processWarningOccurred("Encountered non-RGB ICC Profile, ignoring color profile, colors may appear incorrect");
-                            }
+                            iccProfile = ColorProfiles.readProfile(IIOUtil.createStreamAdapter(imageInput, chunkLength));
                         }
                         else {
                             processWarningOccurred(String.format("Expected 'ICCP' chunk, '%s' chunk encountered", fourCC(nextChunk)));
@@ -399,10 +386,9 @@ final class WebPImageReader extends ImageReaderBase {
 
         if (iccProfile != null && !ColorProfiles.isCS_sRGB(iccProfile)) {
             ICC_ColorSpace colorSpace = ColorSpaces.createColorSpace(iccProfile);
-            int[] bandOffsets = header.containsALPH ? new int[]{0, 1, 2, 3} : new int[]{0, 1, 2};
+            int[] bandOffsets = header.containsALPH ? new int[] {0, 1, 2, 3} : new int[] {0, 1, 2};
             return ImageTypeSpecifiers.createInterleaved(colorSpace, bandOffsets, DataBuffer.TYPE_BYTE, header.containsALPH, false);
         }
-        // Non-RGB profile is simply ignored
 
         return ImageTypeSpecifiers.createFromBufferedImageType(header.containsALPH ? BufferedImage.TYPE_4BYTE_ABGR : BufferedImage.TYPE_3BYTE_BGR);
     }
@@ -418,18 +404,8 @@ final class WebPImageReader extends ImageReaderBase {
         }
 
         types.add(rawImageType);
-
-        if (!header.containsALPH) {
-            types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
-            types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_BGR));
-
-            // We can always decode into types with alpha
-            types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_4BYTE_ABGR));
-        }
-
-        types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_ARGB));
-        types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_ARGB_PRE));
-        types.add(ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_4BYTE_ABGR_PRE));
+        types.add(ImageTypeSpecifiers.createFromBufferedImageType(header.containsALPH ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB));
+        types.add(ImageTypeSpecifiers.createFromBufferedImageType(header.containsALPH ? BufferedImage.TYPE_INT_ARGB_PRE : BufferedImage.TYPE_INT_BGR));
 
         return types.iterator();
     }

imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorTransform.java

@@ -60,7 +60,7 @@ final class PredictorTransform implements Transform {
 
         // (0,0) Black (0x000000ff) predict
         raster.getDataElements(0, 0, rgba);
-        rgba[3] += (byte) 0xff;
+        rgba[3] += 0xff;
         raster.setDataElements(0, 0, rgba);
 
         byte[] predictor = new byte[4];
@@ -100,7 +100,7 @@ final class PredictorTransform implements Transform {
 
                 switch (transformType) {
                     case PredictorMode.BLACK:
-                        rgba[3] += (byte) 0xff;
+                        rgba[3] += 0xff;
                         break;
                     case PredictorMode.L:
                         raster.getDataElements(lX, y, predictor);

imageio/imageio-webp/src/test/java/com/twelvemonkeys/imageio/plugins/webp/WebPImageReaderTest.java

@@ -60,9 +60,7 @@ public class WebPImageReaderTest extends ImageReaderAbstractTest<WebPImageReader
                         new Dimension(394, 383), new Dimension(394, 394), new Dimension(372, 394),
                         new Dimension(400, 400), new Dimension(320, 382)),
                 // Alpha transparency and Alpha filtering
-                new TestData(getClassLoaderResource("/webp/alpha_filter.webp"), new Dimension(1600, 1600)),
-                // Lossy with grayscale ICC profile
-                new TestData(getClassLoaderResource("/webp/incompatible-icc-gray.webp"), new Dimension(766, 1100))
+                new TestData(getClassLoaderResource("/webp/alpha_filter.webp"), new Dimension(1600, 1600))
         );
     }
 

imageio/imageio-xwd/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-xwd</artifactId>
     <name>TwelveMonkeys :: ImageIO :: XWD plugin</name>
@@ -28,21 +28,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
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

imageio/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.9.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.twelvemonkeys.imageio</groupId>
@@ -161,12 +161,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-	        <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>imageio-webp</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>imageio-core</artifactId>
@@ -176,20 +170,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <configuration>
-                        <instructions>
-                            <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
-                        </instructions>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>