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

RIP MagickAccelerator & friends, remove JMagick dependency
Bump org.apache.maven.plugins:maven-surefire-report-plugin
2026-05-20 00:00:03 -04:00 · 2024-10-07 20:36:47 +02:00 · 2024-10-07 20:24:43 +02:00 · 2024-10-07 11:12:34 +02:00 · 2024-10-07 11:12:13 +02:00 · 2024-10-06 13:45:48 +02:00
115 changed files with 2048 additions and 1090 deletions
@@ -17,13 +17,13 @@ jobs:
      fail-fast: false
      matrix:
        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        java: [ 8, 11, 17, 21 ]
+        java: [ 11, 17, 21 ]
    runs-on: ${{ matrix.os }}
    permissions:
      checks: write
    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
        with:
          distribution: 'temurin'
          java-version: ${{ matrix.java }}
@@ -32,13 +32,40 @@ 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@db71d41eb79864e25ab0337e395c352e84523afe # v4.3.1
        if: ${{ !cancelled() }}
        with:
          report_paths: "**/target/surefire-reports/TEST*.xml"
          check_name: Unit Test Results for OpenJDK ${{ matrix.java }} on ${{ matrix.os }}

-  test_oracle:
+  test-jdk8:
+    name: Test OpenJDK ${{ matrix.java }} on ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-13 ]
+        java: [ 8 ]
+    runs-on: ${{ matrix.os }}
+    permissions:
+      checks: write
+    steps:
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          java-package: jdk
+          cache: 'maven'
+      - name: Run Tests
+        run: mvn --batch-mode --no-transfer-progress test
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4.3.1
+        if: ${{ !cancelled() }}
+        with:
+          report_paths: "**/target/surefire-reports/TEST*.xml"
+          check_name: Unit Test Results for OpenJDK ${{ matrix.java }} on ${{ matrix.os }}
+
+  test-oracle:
    name: Test Oracle JDK 8 with KCMS=${{ matrix.kcms }}
    runs-on: ubuntu-latest
    permissions:
@@ -47,11 +74,11 @@ jobs:
      matrix:
        kcms: [ true, false ]
    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
      - 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@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
        with:
          distribution: 'jdkfile'
          jdkFile: ${{ runner.temp }}/java_package.tar.gz
@@ -66,7 +93,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@db71d41eb79864e25ab0337e395c352e84523afe # v4.3.1
        if: ${{ !cancelled() }}
        with:
          report_paths: "**/target/surefire-reports/TEST*.xml"
@@ -74,13 +101,13 @@ jobs:

  release:
    name: Deploy
-    needs: [ test, test_oracle ]
+    needs: [ test, test-jdk8, test-oracle ]
    if: github.ref == 'refs/heads/master' # only perform on latest master
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
      - name: Set up Maven Central
-        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
        with: # running setup-java again overwrites the settings.xml
          distribution: 'temurin'
          java-version: '8'
@@ -33,11 +33,11 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+      uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +51,7 @@ jobs:
    # 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
+      uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11

    # ℹ️ 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
@@ -64,6 +64,6 @@ jobs:
    #     ./location_of_script_within_repo/buildscript.sh

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+      uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
      with:
        category: "/language:${{matrix.language}}"
@@ -26,12 +26,12 @@ jobs:

    steps:
      - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
        with:
          persist-credentials: false

      - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
        with:
          results_file: results.sarif
          results_format: sarif
@@ -49,7 +49,7 @@ jobs:
      # 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
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
        with:
          name: SARIF file
          path: results.sarif
@@ -57,6 +57,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
        with:
          sarif_file: results.sarif
@@ -278,12 +278,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.9.4</version>
+        <version>3.10.1</version>
    </dependency>
    <dependency>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio-tiff</artifactId>
-        <version>3.9.4</version>
+        <version>3.10.1</version>
    </dependency>

    <!--
@@ -293,7 +293,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.9.4</version>
+        <version>3.10.1</version>
    </dependency>

    <!--
@@ -302,7 +302,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.9.4</version>
+        <version>3.10.1</version>
        <classifier>jakarta</classifier>
    </dependency>
 </dependencies>
@@ -312,18 +312,18 @@ 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.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
+    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

 #### Deploying the plugins in a web app

-Because the `ImageIO` plugin registry (the `IIORegistry`) is "VM global", it doesn't by default work well with
-servlet contexts. This is especially evident if you load plugins from the `WEB-INF/lib` or `classes` folder.
+Because the `ImageIO` plugin registry (the `IIORegistry`) is "VM global", it does not work well with
+servlet contexts as-is. This is especially evident if you load plugins from the `WEB-INF/lib` or `classes` folder.
 Unless you add `ImageIO.scanForPlugins()` somewhere in your code, the plugins might never be available at all.

 In addition, servlet contexts dynamically loads and unloads classes (using a new class loader per context).
@@ -359,6 +359,16 @@ or other ImageIO plugins as well.

 Another safe option, is to place the JAR files in the application server's shared or common lib folder. 

+##### Jakarta Servlet Support
+
+For those transitioning from the old `javax.servlet` to the new `jakarta.servlet` package, there is a separate 
+dependency available. It contains exactly the same servlet classes as mentioned above, but built against the new Jakarta EE
+packages. The dependency has the same group name and identifier as before, but a `jakarta` *classifier* appended, to 
+distinguish it from the non-Jakarta package.
+
+See the [Maven dependency example](#maven-dependency-example) for how to enable it with Maven. 
+Gradle or other build tools will have similar options.
+
 #### Including the plugins in a "fat" JAR

 The recommended way to use the plugins, is just to include the JARs as-is in your project, through a Maven dependency or similar. 
@@ -384,44 +394,44 @@ Other "fat" JAR bundlers will probably have similar mechanisms to merge entries

 ### Links to prebuilt binaries

-##### Latest version (3.9.4)
+##### Latest version (3.10.1)

 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.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)
+* [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)

 ImageIO dependencies
-* [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-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 plugins
-* [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-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 plugins requiring 3rd party libs
-* [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)
+* [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)

 Photoshop Path support for ImageIO
-* [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)
+* [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)

 Servlet support
-* [servlet-3.9.4.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.9.4/servlet-3.9.4.jar)
+* [servlet-3.10.1.jar](https://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.10.1/servlet-3.10.1.jar)

 ## License

@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>

    <groupId>com.twelvemonkeys.bom</groupId>
@@ -63,6 +63,11 @@
                <artifactId>imageio-hdr</artifactId>
                <version>${project.version}</version>
            </dependency>
+            <dependency>
+                <groupId>com.twelvemonkeys.imageio</groupId>
+                <artifactId>imageio-dds</artifactId>
+                <version>${project.version}</version>
+            </dependency>
            <dependency>
                <groupId>com.twelvemonkeys.imageio</groupId>
                <artifactId>imageio-icns</artifactId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>common-image</artifactId>
    <packaging>jar</packaging>
@@ -28,13 +28,6 @@
            <artifactId>common-io</artifactId>
        </dependency>

-        <dependency>
-            <groupId>jmagick</groupId>
-            <artifactId>jmagick</artifactId>
-            <version>6.6.9</version>
-            <optional>true</optional>
-            <scope>provided</scope>
-        </dependency>
    </dependencies>

    <build>
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2008, 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.image;
-
-import com.twelvemonkeys.lang.SystemUtil;
-import magick.MagickImage;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-
-/**
- * This class accelerates certain graphics operations, using
- * JMagick and ImageMagick, if available.
- * If those libraries are not installed, this class silently does nothing.
- * <p>
- * Set the system property {@code "com.twelvemonkeys.image.accel"} to
- * {@code false}, to disable, even if JMagick is installed.
- * Set the system property {@code "com.twelvemonkeys.image.magick.debug"} to
- * </p>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java#3 $
- */
-final class MagickAccelerator {
-
-    private static final boolean DEBUG = Magick.DEBUG;
-    private static final boolean USE_MAGICK = useMagick();
-
-    private static final int RESAMPLE_OP = 0;
-
-    private static Class[] nativeOp = new Class[1];
-
-    static {
-        try {
-            nativeOp[RESAMPLE_OP] = Class.forName("com.twelvemonkeys.image.ResampleOp");
-        }
-        catch (ClassNotFoundException e) {
-            System.err.println("Could not find class: " + e);
-        }
-    }
-
-    private static boolean useMagick() {
-        try {
-            boolean available = SystemUtil.isClassAvailable("magick.MagickImage");
-
-            if (DEBUG && !available) {
-                System.err.print("ImageMagick bindings not available.");
-            }
-
-            boolean useMagick =
-                    available && !"FALSE".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.image.accel"));
-
-            if (DEBUG) {
-                System.err.println(
-                        useMagick
-                                ? "Will use ImageMagick bindings to accelerate image resampling operations."
-                                : "Will not use ImageMagick to accelerate image resampling operations."
-                );
-            }
-
-            return useMagick;
-        }
-        catch (Throwable t) {
-            // Most probably in case of a SecurityManager
-            System.err.println("Could not enable ImageMagick bindings: " + t);
-            return false;
-        }
-    }
-
-    private static int getNativeOpIndex(Class pOpClass) {
-        for (int i = 0; i < nativeOp.length; i++) {
-            if (pOpClass == nativeOp[i]) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    public static BufferedImage filter(BufferedImageOp pOperation, BufferedImage pInput, BufferedImage pOutput) {
-        if (!USE_MAGICK) {
-            return null;
-        }
-
-        BufferedImage result = null;
-        switch (getNativeOpIndex(pOperation.getClass())) {
-            case RESAMPLE_OP:
-                ResampleOp resample = (ResampleOp) pOperation;
-                result = resampleMagick(pInput, resample.width, resample.height, resample.filterType);
-
-                // NOTE: If output parameter is non-null, we have to return that
-                // image, instead of result
-                if (pOutput != null) {
-                    //pOutput.setData(result.getRaster()); // Fast, but less compatible
-                    // NOTE: For some reason, this is sometimes super-slow...?
-                    ImageUtil.drawOnto(pOutput, result);
-                    result = pOutput;
-                }
-
-                break;
-
-            default:
-                // Simply fall through, allowing acceleration to be added later
-                break;
-
-        }
-        
-        return result;
-    }
-
-    private static BufferedImage resampleMagick(BufferedImage pSrc, int pWidth, int pHeight, int pFilterType) {
-        // Convert to Magick, scale and convert back
-        MagickImage image = null;
-        MagickImage scaled = null;
-        try {
-            image = MagickUtil.toMagick(pSrc);
-
-            long start = 0;
-            if (DEBUG) {
-                start = System.currentTimeMillis();
-            }
-
-            // NOTE: setFilter affects zoomImage, NOT scaleImage
-            image.setFilter(pFilterType);
-            scaled = image.zoomImage(pWidth, pHeight);
-            //scaled = image.scaleImage(pWidth, pHeight); // AREA_AVERAGING
-
-            if (DEBUG) {
-                long time = System.currentTimeMillis() - start;
-                System.out.println("Filtered: " + time + " ms");
-            }
-
-            return MagickUtil.toBuffered(scaled);
-        }
-        //catch (MagickException e) {
-        catch (Exception e) {
-            // NOTE: Stupid workaround: If MagickException is caught, a
-            // NoClassDefFoundError is thrown, when MagickException class is
-            // unavailable...
-            if (e instanceof RuntimeException) {
-                throw (RuntimeException) e;
-            }
-
-            throw new ImageConversionException(e.getMessage(), e);
-        }
-        finally {
-            // NOTE: ImageMagick might be unstable after a while, if image data
-            // is not deallocated. The GC/finalize method handles this, but in
-            // special circumstances, it's not triggered often enough.
-            if (image != null) {
-                image.destroyImages();
-            }
-            if (scaled != null) {
-                scaled.destroyImages();
-            }
-        }
-    }
-}
@@ -1,621 +0,0 @@
-/*
- * Copyright (c) 2008, 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.image;
-
-import magick.ImageType;
-import magick.MagickException;
-import magick.MagickImage;
-import magick.PixelPacket;
-
-import java.awt.*;
-import java.awt.color.ColorSpace;
-import java.awt.color.ICC_ColorSpace;
-import java.awt.color.ICC_Profile;
-import java.awt.image.*;
-
-/**
- * Utility for converting JMagick {@code MagickImage}s to standard Java
- * {@code BufferedImage}s and back.
- * <p>
- * <em>NOTE: This class is considered an implementation detail and not part of
- * the public API. This class is subject to change without further notice. 
- * You have been warned. :-)</em>
- * </p>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickUtil.java#4 $
- */
-public final class MagickUtil {
-    // IMPORTANT NOTE: Disaster happens if any of these constants are used outside this class
-    // because you then have a dependency on MagickException (this is due to Java class loading
-    // and initialization magic).
-    // Do not use outside this class. If the constants need to be shared, move to Magick or ImageUtil.
-
-    /** Color Model usesd for bilevel (B/W) */
-    private static final IndexColorModel CM_MONOCHROME = MonochromeColorModel.getInstance();
-
-    /** Color Model usesd for raw ABGR */
-    private static final ColorModel CM_COLOR_ALPHA =
-            new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), new int[] {8, 8, 8, 8},
-                            true, true, Transparency.TRANSLUCENT, DataBuffer.TYPE_BYTE);
-
-    /** Color Model usesd for raw BGR */
-    private static final ColorModel CM_COLOR_OPAQUE =
-            new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), new int[] {8, 8, 8},
-                            false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
-
-    /** Color Model usesd for raw RGB */
-    //private static final ColorModel CM_COLOR_RGB = new DirectColorModel(24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x0);
-
-    /** Color Model usesd for raw GRAY + ALPHA */
-    private static final ColorModel CM_GRAY_ALPHA =
-            new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_GRAY),
-                            true, true, Transparency.TRANSLUCENT, DataBuffer.TYPE_BYTE);
-
-    /** Color Model usesd for raw GRAY */
-    private static final ColorModel CM_GRAY_OPAQUE =
-            new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_GRAY),
-                            false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
-
-    /** Band offsets for raw ABGR */
-    private static final int[] BAND_OFF_TRANS = new int[] {3, 2, 1, 0};
-
-    /** Band offsets for raw BGR */
-    private static final int[] BAND_OFF_OPAQUE = new int[] {2, 1, 0};
-
-    /** The point at {@code 0, 0} */
-    private static final Point LOCATION_UPPER_LEFT = new Point(0, 0);
-
-    private static final boolean DEBUG = Magick.DEBUG;
-
-    // Only static members and methods
-    private MagickUtil() {}
-
-    /**
-     * Converts a {@code MagickImage} to a {@code BufferedImage}.
-     * <p>
-     * The conversion depends on {@code pImage}'s {@code ImageType}:
-     * </p>
-     * <dl>
-     * <dt>{@code ImageType.BilevelType}</dt>
-     * <dd>{@code BufferedImage} of type {@code TYPE_BYTE_BINARY}</dd>
-     *
-     * <dt>{@code ImageType.GrayscaleType}</dt>
-     * <dd>{@code BufferedImage} of type {@code TYPE_BYTE_GRAY}</dd>
-     * <dt>{@code ImageType.GrayscaleMatteType}</dt>
-     * <dd>{@code BufferedImage} of type {@code TYPE_USHORT_GRAY}</dd>
-     *
-     * <dt>{@code ImageType.PaletteType}</dt>
-     * <dd>{@code BufferedImage} of type {@code TYPE_BYTE_BINARY} (for images
-     * with a palette of &lt;= 16 colors) or {@code TYPE_BYTE_INDEXED}</dd>
-     * <dt>{@code ImageType.PaletteMatteType}</dt>
-     * <dd>{@code BufferedImage} of type {@code TYPE_BYTE_BINARY} (for images
-     * with a palette of &lt;= 16 colors) or {@code TYPE_BYTE_INDEXED}</dd>
-     *
-     * <dt>{@code ImageType.TrueColorType}</dt>
-     * <dd>{@code BufferedImage} of type {@code TYPE_3BYTE_BGR}</dd>
-     * <dt>{@code ImageType.TrueColorPaletteType}</dt>
-     * <dd>{@code BufferedImage} of type {@code TYPE_4BYTE_ABGR}</dd>
-     * </dl>
-     *
-     * @param pImage the original {@code MagickImage}
-     * @return a new {@code BufferedImage}
-     *
-     * @throws IllegalArgumentException if {@code pImage} is {@code null}
-     * or if the {@code ImageType} is not one mentioned above.
-     * @throws MagickException if an exception occurs during conversion
-     *
-     * @see BufferedImage
-     */
-    public static BufferedImage toBuffered(MagickImage pImage) throws MagickException {
-        if (pImage == null) {
-            throw new IllegalArgumentException("image == null");
-        }
-
-        long start = 0L;
-        if (DEBUG) {
-            start = System.currentTimeMillis();
-        }
-
-        BufferedImage image = null;
-        try {
-            switch (pImage.getImageType()) {
-                case ImageType.BilevelType:
-                    image = bilevelToBuffered(pImage);
-                    break;
-                case ImageType.GrayscaleType:
-                    image = grayToBuffered(pImage, false);
-                    break;
-                case ImageType.GrayscaleMatteType:
-                    image = grayToBuffered(pImage, true);
-                    break;
-                case ImageType.PaletteType:
-                    image = paletteToBuffered(pImage, false);
-                    break;
-                case ImageType.PaletteMatteType:
-                    image = paletteToBuffered(pImage, true);
-                    break;
-                case ImageType.TrueColorType:
-                    image = rgbToBuffered(pImage, false);
-                    break;
-                case ImageType.TrueColorMatteType:
-                    image = rgbToBuffered(pImage, true);
-                    break;
-                case ImageType.ColorSeparationType:
-                    image = cmykToBuffered(pImage, false);
-                    break;
-                case ImageType.ColorSeparationMatteType:
-                    image = cmykToBuffered(pImage, true);
-                    break;
-                case ImageType.OptimizeType:
-                default:
-                    throw new IllegalArgumentException("Unknown JMagick image type: " + pImage.getImageType());
-            }
-
-        }
-        finally {
-            if (DEBUG) {
-                long time = System.currentTimeMillis() - start;
-                System.out.println("Converted JMagick image type: " + pImage.getImageType() + " to BufferedImage: " + image);
-                System.out.println("Conversion to BufferedImage: " + time + " ms");
-            }
-        }
-
-        return image;
-    }
-
-    /**
-     * Converts a {@code BufferedImage} to a {@code MagickImage}.
-     * <p>
-     * The conversion depends on {@code pImage}'s {@code ColorModel}:
-     * </p>
-     * <dl>
-     * <dt>{@code IndexColorModel} with 1 bit b/w</dt>
-     * <dd>{@code MagickImage} of type {@code ImageType.BilevelType}</dd>
-     * <dt>{@code IndexColorModel} &gt; 1 bit,</dt>
-     * <dd>{@code MagickImage} of type {@code ImageType.PaletteType}
-     * or {@code MagickImage} of type {@code ImageType.PaletteMatteType}
-     * depending on <tt>ColorModel.getAlpha()</tt></dd>
-     *
-     * <dt>{@code ColorModel.getColorSpace().getType() == ColorSpace.TYPE_GRAY}</dt>
-     * <dd>{@code MagickImage} of type {@code ImageType.GrayscaleType}
-     * or {@code MagickImage} of type {@code ImageType.GrayscaleMatteType}
-     * depending on <tt>ColorModel.getAlpha()</tt></dd>
-     *
-     * <dt>{@code ColorModel.getColorSpace().getType() == ColorSpace.TYPE_RGB}</dt>
-     * <dd>{@code MagickImage} of type {@code ImageType.TrueColorType}
-     * or {@code MagickImage} of type {@code ImageType.TrueColorPaletteType}</dd>
-     * </dl>
-     *
-     * @param pImage the original {@code BufferedImage}
-     * @return a new {@code MagickImage}
-     *
-     * @throws IllegalArgumentException if {@code pImage} is {@code null}
-     * or if the {@code ColorModel} is not one mentioned above.
-     * @throws MagickException if an exception occurs during conversion
-     *
-     * @see BufferedImage
-     */
-    public static MagickImage toMagick(BufferedImage pImage) throws MagickException {
-        if (pImage == null) {
-            throw new IllegalArgumentException("image == null");
-        }
-
-        long start = 0L;
-        if (DEBUG) {
-            start = System.currentTimeMillis();
-        }
-
-        try {
-            ColorModel cm = pImage.getColorModel();
-            if (cm instanceof IndexColorModel) {
-                // Handles both BilevelType, PaletteType and PaletteMatteType
-                return indexedToMagick(pImage, (IndexColorModel) cm, cm.hasAlpha());
-            }
-
-            switch (cm.getColorSpace().getType()) {
-                case ColorSpace.TYPE_GRAY:
-                    // Handles GrayType and GrayMatteType
-                    return grayToMagick(pImage, cm.hasAlpha());
-                case ColorSpace.TYPE_RGB:
-                    // Handles TrueColorType and TrueColorMatteType
-                    return rgbToMagic(pImage, cm.hasAlpha());
-                case ColorSpace.TYPE_CMY:
-                case ColorSpace.TYPE_CMYK:
-                case ColorSpace.TYPE_HLS:
-                case ColorSpace.TYPE_HSV:
-                    // Other types not supported yet
-                default:
-                    throw new IllegalArgumentException("Unknown buffered image type: " + pImage);
-            }
-        }
-        finally {
-            if (DEBUG) {
-                long time = System.currentTimeMillis() - start;
-                System.out.println("Conversion to MagickImage: " + time + " ms");
-            }
-        }
-    }
-
-    private static MagickImage rgbToMagic(BufferedImage pImage, boolean pAlpha) throws MagickException {
-        MagickImage image = new MagickImage();
-
-        BufferedImage buffered = ImageUtil.toBuffered(pImage, pAlpha ? BufferedImage.TYPE_4BYTE_ABGR : BufferedImage.TYPE_3BYTE_BGR);
-
-        // Need to get data of sub raster, not the full data array, this is
-        // just a convenient way
-        Raster raster;
-        if (buffered.getRaster().getParent() != null) {
-            raster = buffered.getData(new Rectangle(buffered.getWidth(), buffered.getHeight()));
-        }
-        else {
-            raster = buffered.getRaster();
-        }
-
-        image.constituteImage(buffered.getWidth(), buffered.getHeight(), pAlpha ? "ABGR" : "BGR",
-                              ((DataBufferByte) raster.getDataBuffer()).getData());
-
-        return image;
-    }
-
-    private static MagickImage grayToMagick(BufferedImage pImage, boolean pAlpha) throws MagickException {
-        MagickImage image = new MagickImage();
-
-        // TODO: Make a fix for TYPE_USHORT_GRAY
-        // The code below does not seem to work (JMagick issues?)...
-        /*
-        if (pImage.getType() == BufferedImage.TYPE_USHORT_GRAY) {
-            short[] data = ((DataBufferUShort) pImage.getRaster().getDataBuffer()).getData();
-            int[] intData = new int[data.length];
-            for (int i = 0; i < data.length; i++) {
-                intData[i] = (data[i] & 0xffff) * 0xffff;
-            }
-            image.constituteImage(pImage.getWidth(), pImage.getHeight(), "I", intData);
-
-            System.out.println("storageClass: " + image.getStorageClass());
-            System.out.println("depth: " + image.getDepth());
-            System.out.println("imageType: " + image.getImageType());
-        }
-        else {
-        */
-        BufferedImage buffered = ImageUtil.toBuffered(pImage, pAlpha ? BufferedImage.TYPE_4BYTE_ABGR : BufferedImage.TYPE_BYTE_GRAY);
-
-        // Need to get data of sub raster, not the full data array, this is
-        // just a convenient way
-        Raster raster;
-        if (buffered.getRaster().getParent() != null) {
-            raster = buffered.getData(new Rectangle(buffered.getWidth(), buffered.getHeight()));
-        }
-        else {
-            raster = buffered.getRaster();
-        }
-
-        image.constituteImage(buffered.getWidth(), buffered.getHeight(), pAlpha ? "ABGR" : "I", ((DataBufferByte) raster.getDataBuffer()).getData());
-        //}
-
-        return image;
-    }
-
-    private static MagickImage indexedToMagick(BufferedImage pImage, IndexColorModel pColorModel, boolean pAlpha) throws MagickException {
-        MagickImage image = rgbToMagic(pImage, pAlpha);
-
-        int mapSize = pColorModel.getMapSize();
-        image.setNumberColors(mapSize);
-
-        return image;
-    }
-
-    /*
-    public static MagickImage toMagick(BufferedImage pImage) throws MagickException {
-        if (pImage == null) {
-            throw new IllegalArgumentException("image == null");
-        }
-        
-        final int width = pImage.getWidth();
-        final int height = pImage.getHeight();
-
-        // int ARGB -> byte RGBA conversion
-        // NOTE: This is ImageMagick Q16 compatible raw RGBA format with 16 bits/sample...
-        //       For a Q8 build, we could probably go with half the space...
-        // NOTE: This is close to insanity, as it wastes extreme ammounts of memory
-        final int[] argb = new int[width];
-        final byte[] raw16 = new byte[width * height * 8];
-        for (int y = 0; y < height; y++) {
-            // Fetch one line of ARGB data
-            pImage.getRGB(0, y, width, 1, argb, 0, width);
-
-            for (int x = 0; x < width; x++) {
-                int pixel = (x + (y * width)) * 8;
-                raw16[pixel    ] = (byte) ((argb[x] >> 16) & 0xff); // R
-                raw16[pixel + 2] = (byte) ((argb[x] >>  8) & 0xff); // G
-                raw16[pixel + 4] = (byte) ((argb[x]      ) & 0xff); // B
-                raw16[pixel + 6] = (byte) ((argb[x] >> 24) & 0xff); // A
-            }
-        }
-
-        // Create magick image
-        ImageInfo info = new ImageInfo();
-        info.setMagick("RGBA"); // Raw RGBA samples
-        info.setSize(width + "x" + height); // String?!?
-
-        MagickImage image = new MagickImage(info);
-        image.setImageAttribute("depth", "8");
-
-        // Set pixel data in 16 bit raw RGBA format
-        image.blobToImage(info, raw16);
-
-        return image;
-    }
-    */
-
-    /**
-     * Converts a bi-level {@code MagickImage} to a {@code BufferedImage}, of
-     * type {@code TYPE_BYTE_BINARY}.
-     *
-     * @param pImage the original {@code MagickImage}
-     * @return a new {@code BufferedImage}
-     *
-     * @throws MagickException if an exception occurs during conversion
-     *
-     * @see BufferedImage
-     */
-    private static BufferedImage bilevelToBuffered(MagickImage pImage) throws MagickException {
-        // As there is no way to get the binary representation of the image,
-        // convert to gray, and the create a binary image from it
-        BufferedImage temp = grayToBuffered(pImage, false);
-
-        BufferedImage image = new BufferedImage(temp.getWidth(), temp.getHeight(), BufferedImage.TYPE_BYTE_BINARY, CM_MONOCHROME);
-
-        ImageUtil.drawOnto(image, temp);
-
-        return image;
-    }
-
-    /**
-     * Converts a gray {@code MagickImage} to a {@code BufferedImage}, of
-     * type {@code TYPE_USHORT_GRAY} or {@code TYPE_BYTE_GRAY}.
-     *
-     * @param pImage the original {@code MagickImage}
-     * @param pAlpha keep alpha channel
-     * @return a new {@code BufferedImage}
-     *
-     * @throws MagickException if an exception occurs during conversion
-     *
-     * @see BufferedImage
-     */
-    private static BufferedImage grayToBuffered(MagickImage pImage, boolean pAlpha) throws MagickException {
-        Dimension size = pImage.getDimension();
-        int length = size.width * size.height;
-        int bands = pAlpha ? 2 : 1;
-        byte[] pixels = new byte[length * bands];
-
-        // TODO: Make a fix for 16 bit TYPE_USHORT_GRAY?!
-        // Note: The ordering AI or I corresponds to BufferedImage
-        // TYPE_CUSTOM and TYPE_BYTE_GRAY respectively
-        pImage.dispatchImage(0, 0, size.width, size.height, pAlpha ? "AI" : "I", pixels);
-
-        // Init databuffer with array, to avoid allocation of empty array
-        DataBuffer buffer = new DataBufferByte(pixels, pixels.length);
-
-        int[] bandOffsets = pAlpha ? new int[] {1, 0} : new int[] {0};
-
-        WritableRaster raster =
-                Raster.createInterleavedRaster(buffer, size.width, size.height,
-                        size.width * bands, bands, bandOffsets, LOCATION_UPPER_LEFT);
-
-        return new BufferedImage(pAlpha ? CM_GRAY_ALPHA : CM_GRAY_OPAQUE, raster, pAlpha, null);
-    }
-
-    /**
-     * Converts a palette-based {@code MagickImage} to a
-     * {@code BufferedImage}, of type {@code TYPE_BYTE_BINARY} (for images
-     * with a palette of &lt;= 16 colors) or {@code TYPE_BYTE_INDEXED}.
-     *
-     * @param pImage the original {@code MagickImage}
-     * @param pAlpha keep alpha channel
-     * @return a new {@code BufferedImage}
-     *
-     * @throws MagickException if an exception occurs during conversion
-     *
-     * @see BufferedImage
-     */
-    private static BufferedImage paletteToBuffered(MagickImage pImage, boolean pAlpha) throws MagickException {
-        // Create indexcolormodel for the image
-        IndexColorModel cm;
-
-        try {
-            cm = createIndexColorModel(pImage.getColormap(), pAlpha);
-        }
-        catch (MagickException e) {
-            // NOTE: Some MagickImages incorrecly (?) reports to be paletteType,
-            //       but does not have a colormap, this is a workaround.
-            return rgbToBuffered(pImage, pAlpha);
-        }
-
-        // As there is no way to get the indexes of an indexed image, convert to
-        // RGB, and the create an indexed image from it
-        BufferedImage temp = rgbToBuffered(pImage, pAlpha);
-
-        BufferedImage image;
-        if (cm.getMapSize() <= 16) {
-            image = new BufferedImage(temp.getWidth(), temp.getHeight(), BufferedImage.TYPE_BYTE_BINARY, cm);
-        }
-        else {
-            image = new BufferedImage(temp.getWidth(), temp.getHeight(), BufferedImage.TYPE_BYTE_INDEXED, cm);
-        }
-
-        // Create transparent background for images containing alpha
-        if (pAlpha) {
-            Graphics2D g = image.createGraphics();
-            try {
-                g.setComposite(AlphaComposite.Clear);
-                g.fillRect(0, 0, temp.getWidth(), temp.getHeight());
-            }
-            finally {
-                g.dispose();
-            }
-        }
-
-        // NOTE: This is (surprisingly) much faster than using g2d.drawImage()..
-        // (Tests shows 20-30ms, vs. 600-700ms on the same image)
-        BufferedImageOp op = new CopyDither(cm);
-        op.filter(temp, image);
-
-        return image;
-    }
-
-    /**
-     * Creates an {@code IndexColorModel} from an array of
-     * {@code PixelPacket}s.
-     *
-     * @param pColormap the original colormap as a {@code PixelPacket} array
-     * @param pAlpha keep alpha channel
-     *
-     * @return a new {@code IndexColorModel}
-     */
-    public static IndexColorModel createIndexColorModel(PixelPacket[] pColormap, boolean pAlpha) {
-        int[] colors = new int[pColormap.length];
-
-        // TODO: Verify if this is correct for alpha...?
-        int trans = pAlpha ? colors.length - 1 : -1;
-
-        //for (int i = 0; i < pColormap.length; i++) {
-        for (int i = pColormap.length - 1; i != 0; i--) {
-            PixelPacket color = pColormap[i];
-            if (pAlpha) {
-                colors[i] = (0xff - (color.getOpacity() & 0xff)) << 24 |
-                            (color.getRed()     & 0xff) << 16 |
-                            (color.getGreen()   & 0xff) <<  8 |
-                            (color.getBlue()    & 0xff);
-            }
-            else {
-                colors[i] = (color.getRed()     & 0xff) << 16 |
-                            (color.getGreen()   & 0xff) <<  8 |
-                            (color.getBlue()    & 0xff);
-            }
-        }
-
-        return new InverseColorMapIndexColorModel(8, colors.length, colors, 0, pAlpha, trans, DataBuffer.TYPE_BYTE);
-    }
-
-    /**
-     * Converts an (A)RGB {@code MagickImage} to a {@code BufferedImage}, of
-     * type {@code TYPE_4BYTE_ABGR} or {@code TYPE_3BYTE_BGR}.
-     *
-     * @param pImage the original {@code MagickImage}
-     * @param pAlpha keep alpha channel
-     * @return a new {@code BufferedImage}
-     *
-     * @throws MagickException if an exception occurs during conversion
-     *
-     * @see BufferedImage
-     */
-    private static BufferedImage rgbToBuffered(MagickImage pImage, boolean pAlpha) throws MagickException {
-        Dimension size = pImage.getDimension();
-        int length = size.width * size.height;
-        int bands = pAlpha ? 4 : 3;
-        byte[] pixels = new byte[length * bands];
-
-        // TODO: If we do multiple dispatches (one per line, typically), we could provide listener
-        //       feedback. But it's currently a lot slower than fetching all the pixels in one go.
-
-        // Note: The ordering ABGR or BGR corresponds to BufferedImage
-        // TYPE_4BYTE_ABGR and TYPE_3BYTE_BGR respectively
-        pImage.dispatchImage(0, 0, size.width, size.height, pAlpha ? "ABGR" : "BGR", pixels);
-
-        // Init databuffer with array, to avoid allocation of empty array
-        DataBuffer buffer = new DataBufferByte(pixels, pixels.length);
-
-        int[] bandOffsets = pAlpha ? BAND_OFF_TRANS : BAND_OFF_OPAQUE;
-
-        WritableRaster raster =
-                Raster.createInterleavedRaster(buffer, size.width, size.height,
-                        size.width * bands, bands, bandOffsets, LOCATION_UPPER_LEFT);
-
-        return new BufferedImage(pAlpha ? CM_COLOR_ALPHA : CM_COLOR_OPAQUE, raster, pAlpha, null);
-    }
-	
-	
-	
-
-    /**
-     * Converts an {@code MagickImage} to a {@code BufferedImage} which holds an CMYK ICC profile
-     *
-     * @param pImage the original {@code MagickImage}
-     * @param pAlpha keep alpha channel
-     * @return a new {@code BufferedImage}
-     *
-     * @throws MagickException if an exception occurs during conversion
-     *
-     * @see BufferedImage
-     */
-    private static BufferedImage cmykToBuffered(MagickImage pImage, boolean pAlpha) throws MagickException {
-		Dimension size = pImage.getDimension();
-		int length = size.width * size.height;
-		
-		// Retreive the ICC profile
-		ICC_Profile profile = ICC_Profile.getInstance(pImage.getColorProfile().getInfo());
-		ColorSpace cs = new ICC_ColorSpace(profile);
-		
-		int bands = cs.getNumComponents() + (pAlpha ? 1 : 0);
-		
-		int[] bits = new int[bands];
-		for (int i = 0; i < bands; i++) {
-			bits[i] = 8;
-		}
-
-        ColorModel cm = pAlpha ?
-                new ComponentColorModel(cs, bits, true, true, Transparency.TRANSLUCENT, DataBuffer.TYPE_BYTE) :
-                new ComponentColorModel(cs, bits, false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
-
-        byte[] pixels = new byte[length * bands];
-
-		// TODO: If we do multiple dispatches (one per line, typically), we could provide listener
-		//       feedback. But it's currently a lot slower than fetching all the pixels in one go.
-		// TODO: handle more generic cases if profile is not CMYK
-		// TODO: Test "ACMYK"
-		pImage.dispatchImage(0, 0, size.width, size.height, pAlpha ? "ACMYK" : "CMYK", pixels);
-
-        // Init databuffer with array, to avoid allocation of empty array
-        DataBuffer buffer = new DataBufferByte(pixels, pixels.length);
-
-		// TODO: build array from bands variable, here it just works for CMYK
-		// The values has not been tested with an alpha picture actually...
-        int[] bandOffsets = pAlpha ? new int[] {0, 1, 2, 3, 4} : new int[] {0, 1, 2, 3};
-
-        WritableRaster raster =
-                Raster.createInterleavedRaster(buffer, size.width, size.height,
-                        size.width * bands, bands, bandOffsets, LOCATION_UPPER_LEFT);
-		
-        return new BufferedImage(cm, raster, pAlpha, null);
-		
-    }
-}
@@ -55,9 +55,7 @@
 package com.twelvemonkeys.image;

 import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
+import java.awt.geom.*;
 import java.awt.image.*;

 /**
@@ -103,15 +101,6 @@ import java.awt.image.*;
 * BufferedImage scaled = new ResampleOp(w, h).filter(temp, null);
 * </pre></blockquote>
 * <p>
- * For maximum performance, this class will use native code, through
- * <a href="http://www.yeo.id.au/jmagick/">JMagick</a>, when available.
- * Otherwise, the class will silently fall back to pure Java mode.
- * Native code may be disabled globally, by setting the system property
- * {@code com.twelvemonkeys.image.accel} to {@code false}.
- * To allow debug of the native code, set the system property
- * {@code com.twelvemonkeys.image.magick.debug} to {@code true}.
- * </p>
- * <p>
 * This {@code BufferedImageOp} is based on C example code found in
 * <a href="http://www.acm.org/tog/GraphicsGems/">Graphics Gems III</a>,
 * Filtered Image Rescaling, by Dale Schumacher (with additional improvments by
@@ -139,9 +128,6 @@ import java.awt.image.*;
 // TODO: Consider using AffineTransformOp for more operations!?
 public class ResampleOp implements BufferedImageOp/* TODO: RasterOp */ {

-    // NOTE: These MUST correspond to ImageMagick filter types, for the
-    // MagickAccelerator to work consistently (see magick.FilterType).
-
    /**
     * Undefined interpolation, filter method will use default filter.
     */
@@ -295,11 +281,10 @@ public class ResampleOp implements BufferedImageOp/* TODO: RasterOp */ {
            new Value(KEY_RESAMPLE_INTERPOLATION, "Blackman-Sinc", FILTER_BLACKMAN_SINC);

    // Member variables
-    // Package access, to allow access from MagickAccelerator
-    int width;
-    int height;
+    private final int width;
+    private final int height;

-    int filterType;
+    private final int filterType;

    /**
     * RendereingHints.Key implementation, works only with Value values.
@@ -547,16 +532,6 @@ public class ResampleOp implements BufferedImageOp/* TODO: RasterOp */ {
                // Fall through
        }

-        // Try to use native ImageMagick code
-        BufferedImage result = MagickAccelerator.filter(this, input, output);
-        if (result != null) {
-            return result;
-        }
-
-        // Otherwise, continue in pure Java mode
-
-        // TODO: What if output != null and wrong size? Create new? Render on only a part? Document?
-
        // If filter type != POINT or BOX and input has IndexColorModel, convert
        // to true color, with alpha reflecting that of the original color model.
        BufferedImage temp;
@@ -571,7 +546,7 @@ public class ResampleOp implements BufferedImageOp/* TODO: RasterOp */ {

        // Create or convert output to a suitable image
        // TODO: OPTIMIZE: Don't really need to convert all types to same as input
-        result = output != null && temp.getType() != BufferedImage.TYPE_CUSTOM ? /*output*/ ImageUtil.toBuffered(output, temp.getType()) : createCompatibleDestImage(temp, null);
+        BufferedImage result = output != null && temp.getType() != BufferedImage.TYPE_CUSTOM ? /*output*/ ImageUtil.toBuffered(output, temp.getType()) : createCompatibleDestImage(temp, null);

        resample(temp, result, filter);

@@ -1280,12 +1255,12 @@ public class ResampleOp implements BufferedImageOp/* TODO: RasterOp */ {
    /*
    *	image rescaling routine
    */
-    class Contributor {
+    static class Contributor {
        int pixel;
        double weight;
    }

-    class ContributorList {
+    static class ContributorList {
        int n;/* number of contributors (may be < p.length) */
        Contributor[] p;/* pointer to list of contributions */
    }
@@ -1,6 +0,0 @@
-TODO:
-    Remove compile-time dependency on JMagick:
-        - Extract interface for MagickAccelerator
-        - Move implementation to separate module
-        - Instantiate impl via reflection
-DONE:
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>common-io</artifactId>
    <packaging>jar</packaging>
@@ -59,7 +59,7 @@ public final class DecoderStream extends FilterInputStream {
     * @see java.io.FilterInputStream#in
     */
    public DecoderStream(final InputStream stream, final Decoder decoder) {
-        // TODO: Let the decoder decide preferred buffer size 
+        // TODO: Let the decoder decide preferred buffer size
        this(stream, decoder, 1024);
    }

@@ -77,7 +77,7 @@ public final class DecoderStream extends FilterInputStream {
        super(stream);

        this.decoder = decoder;
-        buffer = ByteBuffer.allocate(bufferSize);
+        buffer = ByteBuffer.allocate(bufferSize); // TODO: Allow decoder to specify minimum buffer size
        buffer.flip();
    }

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>common-lang</artifactId>
    <packaging>jar</packaging>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <groupId>com.twelvemonkeys.common</groupId>
    <artifactId>common</artifactId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <groupId>com.twelvemonkeys.contrib</groupId>
    <artifactId>contrib</artifactId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-batik</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Batik Plugin</name>
@@ -63,7 +63,7 @@
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
-            <version>2.15.0</version>
+            <version>2.17.0</version>
            <scope>provided</scope>
        </dependency>

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-bmp</artifactId>
    <name>TwelveMonkeys :: ImageIO :: BMP plugin</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-clippath</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Photoshop Path Support</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-core</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Core</name>
@@ -37,14 +37,14 @@ import java.io.IOException;
 import static com.twelvemonkeys.lang.Validate.notNull;

 /**
- * ImageInputStream that writes through a delegate, but keeps local position and bit offset.
+ * ImageOutputStream that writes through a delegate, but keeps local position and bit offset.
 * Note: Flushing or closing this stream will *not* have an effect on the delegate.
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @author last modified by $Author: harald.kuhr$
 * @version $Id: SubImageOutputStream.java,v 1.0 30/03/15 harald.kuhr Exp$
 */
-public class SubImageOutputStream extends ImageOutputStreamImpl {
+public final class SubImageOutputStream extends ImageOutputStreamImpl {
    private final ImageOutputStream stream;
    private final long startPos;

@@ -40,7 +40,7 @@ import javax.imageio.spi.ServiceRegistry;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
 import java.awt.*;
-import java.awt.image.BufferedImage;
+import java.awt.image.*;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.InputStream;
@@ -232,6 +232,10 @@ public final class IIOUtil {
                                    int samplesPerPixel, int bitsPerSample, int samplePeriod) {
        // Period == 1 is a no-op...
        if (samplePeriod == 1) {
+            if (srcRow != destRow) {
+                System.arraycopy(srcRow, srcPos, destRow, destPos, srcWidth);
+            }
+
            return;
        }

@@ -275,6 +279,10 @@ public final class IIOUtil {
                                    int samplesPerPixel, int bitsPerSample, int samplePeriod) {
        // Period == 1 is a no-op...
        if (samplePeriod == 1) {
+            if (srcRow != destRow) {
+                System.arraycopy(srcRow, srcPos, destRow, destPos, srcWidth);
+            }
+
            return;
        }

@@ -283,7 +291,7 @@ public final class IIOUtil {
                "bitsPerSample must be > 0 and <= 16 and a power of 2");
        Validate.isTrue(samplesPerPixel > 0, "samplesPerPixel must be > 0");
        Validate.isTrue(samplesPerPixel * bitsPerSample <= 16 || samplesPerPixel * bitsPerSample % 16 == 0,
-                "samplesPerPixel * bitsPerSample must be < 16 or a multiple of 16 ");
+                "samplesPerPixel * bitsPerSample must be < 16 or a multiple of 16");

        int pixelStride = bitsPerSample * samplesPerPixel / 16;
        for (int x = 0; x < srcWidth * pixelStride; x += samplePeriod * pixelStride) {
@@ -297,6 +305,10 @@ public final class IIOUtil {
                                    int samplesPerPixel, int bitsPerSample, int samplePeriod) {
        // Period == 1 is a no-op...
        if (samplePeriod == 1) {
+            if (srcRow != destRow) {
+                System.arraycopy(srcRow, srcPos, destRow, destPos, srcWidth);
+            }
+
            return;
        }

@@ -305,7 +317,7 @@ public final class IIOUtil {
                "bitsPerSample must be > 0 and <= 32 and a power of 2");
        Validate.isTrue(samplesPerPixel > 0, "samplesPerPixel must be > 0");
        Validate.isTrue(samplesPerPixel * bitsPerSample <= 32 || samplesPerPixel * bitsPerSample % 32 == 0,
-                "samplesPerPixel * bitsPerSample must be < 32 or a multiple of 32 ");
+                "samplesPerPixel * bitsPerSample must be < 32 or a multiple of 32");

        int pixelStride = bitsPerSample * samplesPerPixel / 32;
        for (int x = 0; x < srcWidth * pixelStride; x += samplePeriod * pixelStride) {
@@ -322,7 +334,7 @@ public final class IIOUtil {
                "bitsPerSample must be > 0 and <= 32 and a power of 2");
        Validate.isTrue(samplesPerPixel > 0, "samplesPerPixel must be > 0");
        Validate.isTrue(samplesPerPixel * bitsPerSample <= 32 || samplesPerPixel * bitsPerSample % 32 == 0,
-                "samplesPerPixel * bitsPerSample must be < 32 or a multiple of 32 ");
+                "samplesPerPixel * bitsPerSample must be < 32 or a multiple of 32");

        int pixelStride = bitsPerSample * samplesPerPixel / 32;
        for (int x = 0; x < srcWidth * pixelStride; x += samplePeriod * pixelStride) {
@@ -330,4 +342,21 @@ public final class IIOUtil {
            System.arraycopy(srcRow, srcPos + x, destRow, destPos + x / samplePeriod, pixelStride);
        }
    }
+
+    public static void subsampleRow(double[] srcRow, int srcPos, int srcWidth,
+                                    double[] destRow, int destPos,
+                                    int samplesPerPixel, int bitsPerSample, int samplePeriod) {
+        Validate.isTrue(samplePeriod > 1, "samplePeriod must be > 1"); // Period == 1 could be a no-op...
+        Validate.isTrue(bitsPerSample > 0 && bitsPerSample <= 64 && (bitsPerSample == 1 || bitsPerSample % 2 == 0),
+                "bitsPerSample must be > 0 and <= 64 and a power of 2");
+        Validate.isTrue(samplesPerPixel > 0, "samplesPerPixel must be > 0");
+        Validate.isTrue(samplesPerPixel * bitsPerSample <= 64 || samplesPerPixel * bitsPerSample % 64 == 0,
+                "samplesPerPixel * bitsPerSample must be < 64 or a multiple of 64");
+
+        int pixelStride = bitsPerSample * samplesPerPixel / 64;
+        for (int x = 0; x < srcWidth * pixelStride; x += samplePeriod * pixelStride) {
+            // System.arraycopy should be intrinsic, but consider using direct array access for pixelStride == 1
+            System.arraycopy(srcRow, srcPos + x, destRow, destPos + x / samplePeriod, pixelStride);
+        }
+    }
 }
@@ -139,6 +139,69 @@ public class IIOUtilTest {
        assertArrayEquals(expected, output);
    }

+    @Test
+    public void subsampleRowPeriod1ByteSameArray() {
+        byte[] inputOutput = {-1, 0, (byte) 0xAA, 0, -1};
+        byte[] expected = {-1, 0, (byte) 0xAA, 0, -1};
+
+        IIOUtil.subsampleRow(inputOutput, 0, inputOutput.length, inputOutput, 0, 1, 8, 1);
+
+        assertArrayEquals(expected, inputOutput);
+    }
+
+    @Test
+    public void subsampleRowPeriod1ByteDifferentArray() {
+        byte[] input = {-1, 0, (byte) 0xAA, 0, -1};
+        byte[] output = new byte[input.length];
+        byte[] expected = {-1, 0, (byte) 0xAA, 0, -1};
+
+        IIOUtil.subsampleRow(input, 0, input.length, output, 0, 1, 8, 1);
+
+        assertArrayEquals(expected, output);
+    }
+
+    @Test
+    public void subsampleRowPeriod1ShortSameArray() {
+        short[] inputOutput = {-1, 0, (short) 0xAA77, 0, -1};
+        short[] expected = {-1, 0, (short) 0xAA77, 0, -1};
+
+        IIOUtil.subsampleRow(inputOutput, 0, inputOutput.length, inputOutput, 0, 4, 4, 1);
+
+        assertArrayEquals(expected, inputOutput);
+    }
+
+    @Test
+    public void subsampleRowPeriod1ShortDifferentArray() {
+        short[] input = {-1, 0, (short) 0xAA77, 0, -1};
+        short[] output = new short[input.length];
+        short[] expected = {-1, 0, (short) 0xAA77, 0, -1};
+
+        IIOUtil.subsampleRow(input, 0, input.length, output, 0, 1, 16, 1);
+
+        assertArrayEquals(expected, output);
+    }
+
+    @Test
+    public void subsampleRowPeriod1IntSameArray() {
+        int[] inputOutput = {-1, 0, 0xAA997755, 0, -1};
+        int[] expected = {-1, 0, 0xAA997755, 0, -1};
+
+        IIOUtil.subsampleRow(inputOutput, 0, inputOutput.length, inputOutput, 0, 1, 32, 1);
+
+        assertArrayEquals(expected, inputOutput);
+    }
+
+    @Test
+    public void subsampleRowPeriod1IntDifferentArray() {
+        int[] input = {-1, 0, 0xAA997755, 0, -1};
+        int[] output = new int[input.length];
+        int[] expected = {-1, 0, 0xAA997755, 0, -1};
+
+        IIOUtil.subsampleRow(input, 0, input.length, output, 0, 4, 8, 1);
+
+        assertArrayEquals(expected, output);
+    }
+
    private int divCeil(int numerator, int denominator) {
        return (numerator + denominator - 1) / denominator;
    }
@@ -1391,6 +1391,8 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
    public void testSetDestination() throws IOException {
        ImageReader reader = createReader();
        TestData data = getTestData().get(0);
+        Dimension size = data.getDimension(0);
+
        reader.setInput(data.getInputStream());

        ImageReadParam param = reader.getDefaultReadParam();
@@ -1398,7 +1400,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        while (types.hasNext()) {
            ImageTypeSpecifier type = types.next();

-            BufferedImage destination = type.createBufferedImage(50, 50);
+            BufferedImage destination = type.createBufferedImage(size.width, size.height);
            param.setDestination(destination);

            BufferedImage result = null;
@@ -1448,13 +1450,15 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
    public void testSetDestinationIllegal() throws IOException {
        final ImageReader reader = createReader();
        TestData data = getTestData().get(0);
+        Dimension size = data.getDimension(0);
+
        reader.setInput(data.getInputStream());

        List<ImageTypeSpecifier> illegalTypes = createIllegalTypes(reader.getImageTypes(0));

        ImageReadParam param = reader.getDefaultReadParam();
        for (ImageTypeSpecifier illegalType : illegalTypes) {
-            BufferedImage destination = illegalType.createBufferedImage(50, 50);
+            BufferedImage destination = illegalType.createBufferedImage(size.width, size.height);
            param.setDestination(destination);

            try {
@@ -1755,11 +1759,12 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
        ImageReader reader = createReader();

        for (TestData testData : getTestDataForAffineTransformOpCompatibility()) {
+            Dimension size = testData.getDimension(0);
            try (ImageInputStream input = testData.getInputStream()) {
                reader.setInput(input);

                ImageReadParam param = reader.getDefaultReadParam();
-                param.setSourceRegion(new Rectangle(min(reader.getWidth(0), 64), min(reader.getHeight(0), 64)));
+                param.setSourceRegion(new Rectangle(size.width, size.height));

                BufferedImage originalImage = reader.read(0, param);

@@ -0,0 +1,52 @@
+Copyright (c) 2024, 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.
+
+
+Parts of this software is based on DDSReader by Kenji Sasaki:
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Kenji Sasaki
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>3.12.0</version>
+    </parent>
+    <artifactId>imageio-dds</artifactId>
+    <name>TwelveMonkeys :: ImageIO :: DDS plugin</name>
+    <description>
+        ImageIO plugin for Microsoft Direct DrawSurface (DDS).
+    </description>
+
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.dds</project.jpms.module.name>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <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>
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2024, Paul Allen, 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.dds;
+
+@SuppressWarnings("unused")
+interface DDS {
+    byte[] MAGIC = new byte[]{'D', 'D', 'S', ' '};
+    int HEADER_SIZE = 124;
+
+    // Header Flags
+    int FLAG_CAPS = 0x1;              // Required in every .dds file.
+    int FLAG_HEIGHT = 0x2;            // Required in every .dds file.
+    int FLAG_WIDTH = 0x4;             // Required in every .dds file.
+    int FLAG_PITCH = 0x8;             // Required when pitch is provided for an uncompressed texture.
+    int FLAG_PIXELFORMAT = 0x1000;    // Required in every .dds file.
+    int FLAG_MIPMAPCOUNT = 0x20000;   // Required in a mipmapped texture.
+    int FLAG_LINEARSIZE = 0x80000;    // Required when pitch is provided for a compressed texture.
+    int FLAG_DEPTH = 0x800000;        // Required in a depth texture.
+
+    // Pixel Format Flags
+    int PIXEL_FORMAT_FLAG_FOURCC = 0x04;
+    int PIXEL_FORMAT_FLAG_RGB = 0x40;
+}
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2024, Paul Allen, 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.dds;
+
+import javax.imageio.IIOException;
+import javax.imageio.stream.ImageInputStream;
+import java.awt.Dimension;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+
+final class DDSHeader {
+
+    // https://learn.microsoft.com/en-us/windows/win32/direct3ddds/dx-graphics-dds-pguide
+    private int flags;
+
+    private int mipMapCount;
+    private Dimension[] dimensions;
+
+    private int pixelFormatFlags;
+    private int fourCC;
+    private int bitCount;
+    private int redMask;
+    private int greenMask;
+    private int blueMask;
+    private int alphaMask;
+
+    @SuppressWarnings("unused")
+    static DDSHeader read(final ImageInputStream imageInput) throws IOException {
+        DDSHeader header = new DDSHeader();
+
+        // Read MAGIC bytes [0,3]
+        byte[] magic = new byte[DDS.MAGIC.length];
+        imageInput.readFully(magic);
+        if (!Arrays.equals(DDS.MAGIC, magic)) {
+            throw new IIOException(String.format("Not a DDS file. Expected DDS magic 0x%08x', read 0x%08x", new BigInteger(DDS.MAGIC), new BigInteger(magic)));
+        }
+
+        // DDS_HEADER structure
+        // https://learn.microsoft.com/en-us/windows/win32/direct3ddds/dds-header
+        int dwSize = imageInput.readInt(); // [4,7]
+        if (dwSize != DDS.HEADER_SIZE) {
+            throw new IIOException(String.format("Invalid DDS header size (expected %d): %d", DDS.HEADER_SIZE, dwSize));
+        }
+
+        // Verify flags
+        header.flags = imageInput.readInt(); // [8,11]
+        if (!header.getFlag(DDS.FLAG_CAPS
+                | DDS.FLAG_HEIGHT
+                | DDS.FLAG_WIDTH
+                | DDS.FLAG_PIXELFORMAT)) {
+            throw new IIOException("Required DDS Flag missing in header: " + Integer.toBinaryString(header.flags));
+        }
+
+        // Read Height & Width
+        int dwHeight = imageInput.readInt(); // [12,15]
+        int dwWidth = imageInput.readInt();  // [16,19]
+
+        int dwPitchOrLinearSize = imageInput.readInt(); // [20,23]
+        int dwDepth = imageInput.readInt(); // [24,27]
+
+        // 0 = (unused) or 1 = (1 level), but still one 'base' image
+        header.mipMapCount = Math.max(1, imageInput.readInt()); // [28,31]
+
+        // build dimensions list
+        header.addDimensions(dwWidth, dwHeight);
+
+        byte[] dwReserved1 = new byte[11 * 4];  // [32,75]
+        imageInput.readFully(dwReserved1);
+
+        // DDS_PIXELFORMAT structure
+        int px_dwSize = imageInput.readInt(); // [76,79]
+
+        header.pixelFormatFlags = imageInput.readInt(); // [80,83]
+        header.fourCC = imageInput.readInt(); // [84,87]
+        header.bitCount = imageInput.readInt(); // [88,91]
+        header.redMask = imageInput.readInt(); // [92,95]
+        header.greenMask = imageInput.readInt(); // [96,99]
+        header.blueMask = imageInput.readInt(); // [100,103]
+        header.alphaMask = imageInput.readInt(); // [104,107]
+
+        int dwCaps = imageInput.readInt(); // [108,111]
+        int dwCaps2 = imageInput.readInt(); // [112,115]
+        int dwCaps3 = imageInput.readInt(); // [116,119]
+        int dwCaps4 = imageInput.readInt(); // [120,123]
+
+        int dwReserved2 = imageInput.readInt(); // [124,127]
+
+        return header;
+    }
+
+    private void addDimensions(int width, int height) {
+        dimensions = new Dimension[mipMapCount];
+
+        int w = width;
+        int h = height;
+        for (int i = 0; i < mipMapCount; i++) {
+            dimensions[i] = new Dimension(w, h);
+            w /= 2;
+            h /= 2;
+        }
+    }
+
+    private boolean getFlag(int mask) {
+        return (flags & mask) != 0;
+    }
+
+    int getWidth(int imageIndex) {
+        int lim = dimensions[imageIndex].width;
+        return (lim <= 0) ? 1 : lim;
+    }
+
+    int getHeight(int imageIndex) {
+        int lim =  dimensions[imageIndex].height;
+        return (lim <= 0) ? 1 : lim;
+    }
+
+    int getMipMapCount() {
+        return mipMapCount;
+    }
+
+    int getBitCount() {
+        return bitCount;
+    }
+
+    int getFourCC() {
+        return fourCC;
+    }
+
+    int getPixelFormatFlags() {
+        return pixelFormatFlags;
+    }
+
+    int getRedMask() {
+        return redMask;
+    }
+
+    int getGreenMask() {
+        return greenMask;
+    }
+
+    int getBlueMask() {
+        return blueMask;
+    }
+
+    int getAlphaMask() {
+        return alphaMask;
+    }
+}
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2024, Paul Allen, 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.dds;
+
+import static com.twelvemonkeys.imageio.util.IIOUtil.subsampleRow;
+
+import com.twelvemonkeys.imageio.ImageReaderBase;
+import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.spi.ImageReaderSpi;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.Collections;
+import java.util.Iterator;
+
+public final class DDSImageReader extends ImageReaderBase {
+
+    private DDSHeader header;
+
+    public DDSImageReader(final ImageReaderSpi provider) {
+        super(provider);
+    }
+
+    @Override
+    protected void resetMembers() {
+        header = null;
+    }
+
+    @Override
+    public int getWidth(final int imageIndex) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        return header.getWidth(imageIndex);
+    }
+
+    @Override
+    public int getHeight(int imageIndex) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        return header.getHeight(imageIndex);
+    }
+
+    @Override
+    public int getNumImages(final boolean allowSearch) throws IOException {
+        assertInput();
+        readHeader();
+
+        return header.getMipMapCount();
+    }
+
+    @Override
+    public ImageTypeSpecifier getRawImageType(int imageIndex) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        // TODO: Implement for the specific formats...
+        return ImageTypeSpecifiers.createFromBufferedImageType(BufferedImage.TYPE_INT_ARGB);
+    }
+
+    @Override
+    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
+        return Collections.singletonList(getRawImageType(imageIndex)).iterator();
+    }
+
+    @Override
+    public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException {
+        checkBounds(imageIndex);
+        readHeader();
+
+        processImageStarted(imageIndex);
+
+        DDSReader dds = new DDSReader(header);
+        int[] pixels = dds.read(imageInput, imageIndex);
+
+        int width = getWidth(imageIndex);
+        int height = getHeight(imageIndex);
+
+        BufferedImage destination = getDestination(param, getImageTypes(imageIndex), width, height);
+
+        Rectangle srcRegion = new Rectangle();
+        Rectangle destRegion = new Rectangle();
+
+        computeRegions(param, width, height, destination, srcRegion, destRegion);
+
+        int srcXStep = param != null ? param.getSourceXSubsampling() : 1;
+        int srcYStep = param != null ? param.getSourceYSubsampling() : 1;
+        int srcMaxY = srcRegion.y + srcRegion.height;
+
+        for (int y = 0, srcY = srcRegion.y, destY = destRegion.y; srcY < srcMaxY; y++, srcY += srcYStep, destY++) {
+            int offset = width * srcY + srcRegion.x;
+
+            subsampleRow(pixels, offset, width, pixels, offset, 4, 8, srcXStep);
+            destination.setRGB(destRegion.x, destY, destRegion.width, 1, pixels, offset, width);
+
+            if (abortRequested()) {
+                processReadAborted();
+                break;
+            }
+
+            processImageProgress(100f * y / destRegion.height);
+        }
+
+        processImageComplete();
+
+        return destination;
+    }
+
+    @Override
+    public IIOMetadata getImageMetadata(int imageIndex) throws IOException {
+        ImageTypeSpecifier imageType = getRawImageType(imageIndex);
+
+        return new DDSMetadata(imageType, header);
+    }
+
+    private void readHeader() throws IOException {
+        if (header == null) {
+            imageInput.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+            header = DDSHeader.read(imageInput);
+
+            imageInput.flushBefore(imageInput.getStreamPosition());
+        }
+
+        imageInput.seek(imageInput.getFlushedPosition());
+    }
+
+    public static void main(final String[] args) throws IOException {
+        for (String arg : args) {
+            File file = new File(arg);
+            BufferedImage image = ImageIO.read(file);
+            showIt(image, file.getName());
+        }
+    }
+}
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2024, Paul Allen, 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.dds;
+
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
+
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Locale;
+
+public final class DDSImageReaderSpi extends ImageReaderSpiBase {
+
+    public DDSImageReaderSpi() {
+        super(new DDSProviderInfo());
+    }
+
+    @Override
+    public boolean canDecodeInput(final Object source) throws IOException {
+        if (!(source instanceof ImageInputStream)) {
+            return false;
+        }
+
+        ImageInputStream stream = (ImageInputStream) source;
+
+        stream.mark();
+
+        try {
+            byte[] magic = new byte[DDS.MAGIC.length];
+            stream.readFully(magic);
+
+            return Arrays.equals(DDS.MAGIC, magic);
+        } finally {
+            stream.reset();
+        }
+    }
+
+    @Override
+    public ImageReader createReaderInstance(Object extension) {
+        return new DDSImageReader(this);
+    }
+
+    @Override
+    public String getDescription(Locale locale) {
+        return "Direct DrawSurface (DDS) Image Reader";
+    }
+}
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024, 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.dds;
+
+import javax.imageio.ImageTypeSpecifier;
+
+import com.twelvemonkeys.imageio.StandardImageMetadataSupport;
+
+final class DDSMetadata extends StandardImageMetadataSupport {
+    DDSMetadata(ImageTypeSpecifier type, DDSHeader header) {
+        super(builder(type)
+                      .withCompressionTypeName(compressionName(header))
+                      .withFormatVersion("1.0")
+        );
+    }
+
+    private static String compressionName(DDSHeader header) {
+        // If the fourCC is valid, compression is one of the DXTn versions, otherwise None
+        int flags = header.getPixelFormatFlags();
+
+        if ((flags & DDS.PIXEL_FORMAT_FLAG_FOURCC) != 0) {
+            // DXTn
+            DDSType type = DDSType.valueOf(header.getFourCC());
+
+            return type.name();
+        }
+
+        return "None";
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024, Paul Allen, 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.dds;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+final class DDSProviderInfo extends ReaderWriterProviderInfo {
+    DDSProviderInfo() {
+        super(
+                DDSProviderInfo.class,
+                new String[]{"DDS", "dds"},
+                new String[]{"dds"},
+                new String[]{"image/vnd-ms.dds"},
+                "com.twelvemonkeys.imageio.plugins.dds.DDSImageReader",
+                new String[]{"com.twelvemonkeys.imageio.plugins.dds.DDSImageReaderSpi"},
+                null,
+                null,
+                false, null, null, null, null,
+                true, null, null, null, null
+        );
+    }
+}
@@ -0,0 +1,609 @@
+/*
+ * Copyright (c) 2024, Paul Allen, 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.
+ *
+ * Based on DDSReader.java:
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Kenji Sasaki
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.dds;
+
+import javax.imageio.IIOException;
+import javax.imageio.stream.ImageInputStream;
+import java.io.IOException;
+
+/**
+ * DDSReader.java
+ * <p>
+ * Copyright (c) 2015 Kenji Sasaki
+ * Released under the MIT license.
+ * <a href="https://github.com/npedotnet/DDSReader/blob/master/LICENSE">MIT License</a>
+ * <p>
+ * <a href="https://github.com/npedotnet/DDSReader/blob/master/README.md">English document</a>
+ * <p>
+ * <a href="http://3dtech.jp/wiki/index.php?DDSReader">Japanese document</a>
+ */
+final class DDSReader {
+
+    static final Order ARGB_ORDER = new Order(16, 8, 0, 24);
+
+    private final DDSHeader header;
+
+    DDSReader(DDSHeader header) {
+        this.header = header;
+    }
+
+    int[] read(ImageInputStream imageInput, int imageIndex) throws IOException {
+
+        // type
+        DDSType type = getType();
+
+        // offset buffer to index mipmap image
+        byte[] buffer = null;
+        for (int i = 0; i <= imageIndex; i++) {
+            int len = getLength(type, i);
+            buffer = new byte[len];
+            imageInput.readFully(buffer);
+        }
+
+        int width = header.getWidth(imageIndex);
+        int height = header.getHeight(imageIndex);
+
+        switch (type) {
+            case DXT1:
+                return decodeDXT1(width, height, buffer);
+            case DXT2:
+                return decodeDXT2(width, height, buffer);
+            case DXT3:
+                return decodeDXT3(width, height, buffer);
+            case DXT4:
+                return decodeDXT4(width, height, buffer);
+            case DXT5:
+                return decodeDXT5(width, height, buffer);
+            case A1R5G5B5:
+                return readA1R5G5B5(width, height, buffer);
+            case X1R5G5B5:
+                return readX1R5G5B5(width, height, buffer);
+            case A4R4G4B4:
+                return readA4R4G4B4(width, height, buffer);
+            case X4R4G4B4:
+                return readX4R4G4B4(width, height, buffer);
+            case R5G6B5:
+                return readR5G6B5(width, height, buffer);
+            case R8G8B8:
+                return readR8G8B8(width, height, buffer);
+            case A8B8G8R8:
+                return readA8B8G8R8(width, height, buffer);
+            case X8B8G8R8:
+                return readX8B8G8R8(width, height, buffer);
+            case A8R8G8B8:
+                return readA8R8G8B8(width, height, buffer);
+            case X8R8G8B8:
+                return readX8R8G8B8(width, height, buffer);
+            default:
+                throw new IIOException("Unsupported type: " + type);
+        }
+    }
+
+    private DDSType getType() throws IIOException {
+        int flags = header.getPixelFormatFlags();
+
+        if ((flags & DDS.PIXEL_FORMAT_FLAG_FOURCC) != 0) {
+            // DXT
+            int type = header.getFourCC();
+            return DDSType.valueOf(type);
+
+        } else if ((flags & DDS.PIXEL_FORMAT_FLAG_RGB) != 0) {
+            // RGB
+            int bitCount = header.getBitCount();
+            int redMask = header.getRedMask();
+            int greenMask = header.getGreenMask();
+            int blueMask = header.getBlueMask();
+            int alphaMask = ((flags & 0x01) != 0) ? header.getAlphaMask() : 0; // 0x01 alpha
+            if (bitCount == 16) {
+                if (redMask == A1R5G5B5_MASKS[0] && greenMask == A1R5G5B5_MASKS[1] && blueMask == A1R5G5B5_MASKS[2] && alphaMask == A1R5G5B5_MASKS[3]) {
+                    // A1R5G5B5
+                    return DDSType.A1R5G5B5;
+                } else if (redMask == X1R5G5B5_MASKS[0] && greenMask == X1R5G5B5_MASKS[1] && blueMask == X1R5G5B5_MASKS[2] && alphaMask == X1R5G5B5_MASKS[3]) {
+                    // X1R5G5B5
+                    return DDSType.X1R5G5B5;
+                } else if (redMask == A4R4G4B4_MASKS[0] && greenMask == A4R4G4B4_MASKS[1] && blueMask == A4R4G4B4_MASKS[2] && alphaMask == A4R4G4B4_MASKS[3]) {
+                    // A4R4G4B4
+                    return DDSType.A4R4G4B4;
+                } else if (redMask == X4R4G4B4_MASKS[0] && greenMask == X4R4G4B4_MASKS[1] && blueMask == X4R4G4B4_MASKS[2] && alphaMask == X4R4G4B4_MASKS[3]) {
+                    // X4R4G4B4
+                    return DDSType.X4R4G4B4;
+                } else if (redMask == R5G6B5_MASKS[0] && greenMask == R5G6B5_MASKS[1] && blueMask == R5G6B5_MASKS[2] && alphaMask == R5G6B5_MASKS[3]) {
+                    // R5G6B5
+                    return DDSType.R5G6B5;
+                } else {
+                    throw new IIOException("Unsupported 16bit RGB image.");
+                }
+            } else if (bitCount == 24) {
+                if (redMask == R8G8B8_MASKS[0] && greenMask == R8G8B8_MASKS[1] && blueMask == R8G8B8_MASKS[2] && alphaMask == R8G8B8_MASKS[3]) {
+                    // R8G8B8
+                    return DDSType.R8G8B8;
+                } else {
+                    throw new IIOException("Unsupported 24bit RGB image.");
+                }
+            } else if (bitCount == 32) {
+                if (redMask == A8B8G8R8_MASKS[0] && greenMask == A8B8G8R8_MASKS[1] && blueMask == A8B8G8R8_MASKS[2] && alphaMask == A8B8G8R8_MASKS[3]) {
+                    // A8B8G8R8
+                    return DDSType.A8B8G8R8;
+                } else if (redMask == X8B8G8R8_MASKS[0] && greenMask == X8B8G8R8_MASKS[1] && blueMask == X8B8G8R8_MASKS[2] && alphaMask == X8B8G8R8_MASKS[3]) {
+                    // X8B8G8R8
+                    return DDSType.X8B8G8R8;
+                } else if (redMask == A8R8G8B8_MASKS[0] && greenMask == A8R8G8B8_MASKS[1] && blueMask == A8R8G8B8_MASKS[2] && alphaMask == A8R8G8B8_MASKS[3]) {
+                    // A8R8G8B8
+                    return DDSType.A8R8G8B8;
+                } else if (redMask == X8R8G8B8_MASKS[0] && greenMask == X8R8G8B8_MASKS[1] && blueMask == X8R8G8B8_MASKS[2] && alphaMask == X8R8G8B8_MASKS[3]) {
+                    // X8R8G8B8
+                    return DDSType.X8R8G8B8;
+                } else {
+                    throw new IIOException("Unsupported 32bit RGB image.");
+                }
+            } else {
+                throw new IIOException("Unsupported bit count: " + bitCount);
+            }
+        } else {
+            throw new IIOException("Unsupported YUV or LUMINANCE image.");
+        }
+    }
+
+    private int getLength(DDSType type, int imageIndex) throws IIOException {
+        int width = header.getWidth(imageIndex);
+        int height = header.getHeight(imageIndex);
+
+        switch (type) {
+            case DXT1:
+                return 8 * ((width + 3) / 4) * ((height + 3) / 4);
+            case DXT2:
+            case DXT3:
+            case DXT4:
+            case DXT5:
+                return 16 * ((width + 3) / 4) * ((height + 3) / 4);
+            case A1R5G5B5:
+            case X1R5G5B5:
+            case A4R4G4B4:
+            case X4R4G4B4:
+            case R5G6B5:
+            case R8G8B8:
+            case A8B8G8R8:
+            case X8B8G8R8:
+            case A8R8G8B8:
+            case X8R8G8B8:
+                return (type.value() & 0xFF) * width * height;
+            default:
+                throw new IIOException("Unknown type: " + Integer.toHexString(type.value()));
+        }
+    }
+
+    private static int[] decodeDXT1(int width, int height, byte[] buffer) {
+        int[] pixels = new int[width * height];
+        int index = 0;
+        int w = (width + 3) / 4;
+        int h = (height + 3) / 4;
+        for (int i = 0; i < h; i++) {
+            for (int j = 0; j < w; j++) {
+                int c0 = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+                index += 2;
+                int c1 = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+                index += 2;
+                for (int k = 0; k < 4; k++) {
+                    if (4 * i + k >= height) break;
+                    int t0 = (buffer[index] & 0x03);
+                    int t1 = (buffer[index] & 0x0C) >> 2;
+                    int t2 = (buffer[index] & 0x30) >> 4;
+                    int t3 = (buffer[index++] & 0xC0) >> 6;
+                    pixels[4 * width * i + 4 * j + width * k    ] = getDXTColor(c0, c1, 0xFF, t0);
+                    if (4 * j + 1 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 1] = getDXTColor(c0, c1, 0xFF, t1);
+                    if (4 * j + 2 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 2] = getDXTColor(c0, c1, 0xFF, t2);
+                    if (4 * j + 3 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 3] = getDXTColor(c0, c1, 0xFF, t3);
+                }
+            }
+        }
+        return pixels;
+    }
+
+    private static int[] decodeDXT2(int width, int height, byte[] buffer) {
+        return decodeDXT3(width, height, buffer);
+    }
+
+    private static int[] decodeDXT3(int width, int height, byte[] buffer) {
+        int index = 0;
+        int w = (width + 3) / 4;
+        int h = (height + 3) / 4;
+        int[] pixels = new int[width * height];
+        int[] alphaTable = new int[16];
+        for (int i = 0; i < h; i++) {
+            for (int j = 0; j < w; j++) {
+                // create alpha table(4bit to 8bit)
+                for (int k = 0; k < 4; k++) {
+                    int a0 = (buffer[index++] & 0xFF);
+                    int a1 = (buffer[index++] & 0xFF);
+                    // 4bit alpha to 8bit alpha
+                    alphaTable[4 * k    ] = 17 * ((a0 & 0xF0) >> 4);
+                    alphaTable[4 * k + 1] = 17 * (a0 & 0x0F);
+                    alphaTable[4 * k + 2] = 17 * ((a1 & 0xF0) >> 4);
+                    alphaTable[4 * k + 3] = 17 * (a1 & 0x0F);
+                }
+                int c0 = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+                index += 2;
+                int c1 = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+                index += 2;
+                for (int k = 0; k < 4; k++) {
+                    if (4 * i + k >= height) break;
+                    int t0 = (buffer[index] & 0x03);
+                    int t1 = (buffer[index] & 0x0C) >> 2;
+                    int t2 = (buffer[index] & 0x30) >> 4;
+                    int t3 = (buffer[index++] & 0xC0) >> 6;
+                    pixels[4 * width * i + 4 * j + width * k    ] = getDXTColor(c0, c1, alphaTable[4 * k    ], t0);
+                    if (4 * j + 1 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 1] = getDXTColor(c0, c1, alphaTable[4 * k + 1], t1);
+                    if (4 * j + 2 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 2] = getDXTColor(c0, c1, alphaTable[4 * k + 2], t2);
+                    if (4 * j + 3 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 3] = getDXTColor(c0, c1, alphaTable[4 * k + 3], t3);
+                }
+            }
+        }
+        return pixels;
+    }
+
+    private static int[] decodeDXT4(int width, int height, byte[] buffer) {
+        return decodeDXT5(width, height, buffer);
+    }
+
+    private static int[] decodeDXT5(int width, int height, byte[] buffer) {
+        int index = 0;
+        int w = (width + 3) / 4;
+        int h = (height + 3) / 4;
+        int[] pixels = new int[width * height];
+        int[] alphaTable = new int[16];
+        for (int i = 0; i < h; i++) {
+            for (int j = 0; j < w; j++) {
+                // create alpha table
+                int a0 = (buffer[index++] & 0xFF);
+                int a1 = (buffer[index++] & 0xFF);
+                int b0 = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8 | (buffer[index + 2] & 0xFF) << 16;
+                index += 3;
+                int b1 = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8 | (buffer[index + 2] & 0xFF) << 16;
+                index += 3;
+                alphaTable[0] = b0 & 0x07;
+                alphaTable[1] = (b0 >> 3) & 0x07;
+                alphaTable[2] = (b0 >> 6) & 0x07;
+                alphaTable[3] = (b0 >> 9) & 0x07;
+                alphaTable[4] = (b0 >> 12) & 0x07;
+                alphaTable[5] = (b0 >> 15) & 0x07;
+                alphaTable[6] = (b0 >> 18) & 0x07;
+                alphaTable[7] = (b0 >> 21) & 0x07;
+                alphaTable[8] = b1 & 0x07;
+                alphaTable[9] = (b1 >> 3) & 0x07;
+                alphaTable[10] = (b1 >> 6) & 0x07;
+                alphaTable[11] = (b1 >> 9) & 0x07;
+                alphaTable[12] = (b1 >> 12) & 0x07;
+                alphaTable[13] = (b1 >> 15) & 0x07;
+                alphaTable[14] = (b1 >> 18) & 0x07;
+                alphaTable[15] = (b1 >> 21) & 0x07;
+                int c0 = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+                index += 2;
+                int c1 = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+                index += 2;
+                for (int k = 0; k < 4; k++) {
+                    if (4 * i + k >= height) break;
+                    int t0 = (buffer[index] & 0x03);
+                    int t1 = (buffer[index] & 0x0C) >> 2;
+                    int t2 = (buffer[index] & 0x30) >> 4;
+                    int t3 = (buffer[index++] & 0xC0) >> 6;
+                    pixels[4 * width * i + 4 * j + width * k    ] = getDXTColor(c0, c1, getDXT5Alpha(a0, a1, alphaTable[4 * k    ]), t0);
+                    if (4 * j + 1 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 1] = getDXTColor(c0, c1, getDXT5Alpha(a0, a1, alphaTable[4 * k + 1]), t1);
+                    if (4 * j + 2 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 2] = getDXTColor(c0, c1, getDXT5Alpha(a0, a1, alphaTable[4 * k + 2]), t2);
+                    if (4 * j + 3 >= width) continue;
+                    pixels[4 * width * i + 4 * j + width * k + 3] = getDXTColor(c0, c1, getDXT5Alpha(a0, a1, alphaTable[4 * k + 3]), t3);
+                }
+            }
+        }
+        return pixels;
+    }
+
+    private static int[] readA1R5G5B5(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int rgba = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+            index += 2;
+            int r = BIT5[(rgba & A1R5G5B5_MASKS[0]) >> 10];
+            int g = BIT5[(rgba & A1R5G5B5_MASKS[1]) >> 5];
+            int b = BIT5[(rgba & A1R5G5B5_MASKS[2])];
+            int a = 255 * ((rgba & A1R5G5B5_MASKS[3]) >> 15);
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readX1R5G5B5(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int rgba = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+            index += 2;
+            int r = BIT5[(rgba & X1R5G5B5_MASKS[0]) >> 10];
+            int g = BIT5[(rgba & X1R5G5B5_MASKS[1]) >> 5];
+            int b = BIT5[(rgba & X1R5G5B5_MASKS[2])];
+            int a = 255;
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readA4R4G4B4(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int rgba = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+            index += 2;
+            int r = 17 * ((rgba & A4R4G4B4_MASKS[0]) >> 8);
+            int g = 17 * ((rgba & A4R4G4B4_MASKS[1]) >> 4);
+            int b = 17 * ((rgba & A4R4G4B4_MASKS[2]));
+            int a = 17 * ((rgba & A4R4G4B4_MASKS[3]) >> 12);
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readX4R4G4B4(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int rgba = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+            index += 2;
+            int r = 17 * ((rgba & A4R4G4B4_MASKS[0]) >> 8);
+            int g = 17 * ((rgba & A4R4G4B4_MASKS[1]) >> 4);
+            int b = 17 * ((rgba & A4R4G4B4_MASKS[2]));
+            int a = 255;
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readR5G6B5(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int rgba = (buffer[index] & 0xFF) | (buffer[index + 1] & 0xFF) << 8;
+            index += 2;
+            int r = BIT5[((rgba & R5G6B5_MASKS[0]) >> 11)];
+            int g = BIT6[((rgba & R5G6B5_MASKS[1]) >> 5)];
+            int b = BIT5[((rgba & R5G6B5_MASKS[2]))];
+            int a = 255;
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readR8G8B8(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int b = buffer[index++] & 0xFF;
+            int g = buffer[index++] & 0xFF;
+            int r = buffer[index++] & 0xFF;
+            int a = 255;
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readA8B8G8R8(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int r = buffer[index++] & 0xFF;
+            int g = buffer[index++] & 0xFF;
+            int b = buffer[index++] & 0xFF;
+            int a = buffer[index++] & 0xFF;
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readX8B8G8R8(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int r = buffer[index++] & 0xFF;
+            int g = buffer[index++] & 0xFF;
+            int b = buffer[index++] & 0xFF;
+            int a = 255;
+            index++;
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readA8R8G8B8(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int b = buffer[index++] & 0xFF;
+            int g = buffer[index++] & 0xFF;
+            int r = buffer[index++] & 0xFF;
+            int a = buffer[index++] & 0xFF;
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int[] readX8R8G8B8(int width, int height, byte[] buffer) {
+        int index = 0;
+        int[] pixels = new int[width * height];
+        for (int i = 0; i < height * width; i++) {
+            int b = buffer[index++] & 0xFF;
+            int g = buffer[index++] & 0xFF;
+            int r = buffer[index++] & 0xFF;
+            int a = 255;
+            index++;
+            pixels[i] = (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+        }
+        return pixels;
+    }
+
+    private static int getDXTColor(int c0, int c1, int a, int t) {
+        switch (t) {
+            case 0:
+                return getDXTColor1(c0, a);
+            case 1:
+                return getDXTColor1(c1, a);
+            case 2:
+                return (c0 > c1) ? getDXTColor2_1(c0, c1, a) : getDXTColor1_1(c0, c1, a);
+            case 3:
+                return (c0 > c1) ? getDXTColor2_1(c1, c0, a) : 0;
+        }
+        return 0;
+    }
+
+    private static int getDXTColor2_1(int c0, int c1, int a) {
+        // 2*c0/3 + c1/3
+        int r = (2 * BIT5[(c0 & 0xFC00) >> 11] + BIT5[(c1 & 0xFC00) >> 11]) / 3;
+        int g = (2 * BIT6[(c0 & 0x07E0) >> 5] + BIT6[(c1 & 0x07E0) >> 5]) / 3;
+        int b = (2 * BIT5[c0 & 0x001F] + BIT5[c1 & 0x001F]) / 3;
+        return (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+    }
+
+    private static int getDXTColor1_1(int c0, int c1, int a) {
+        // (c0+c1) / 2
+        int r = (BIT5[(c0 & 0xFC00) >> 11] + BIT5[(c1 & 0xFC00) >> 11]) / 2;
+        int g = (BIT6[(c0 & 0x07E0) >> 5] + BIT6[(c1 & 0x07E0) >> 5]) / 2;
+        int b = (BIT5[c0 & 0x001F] + BIT5[c1 & 0x001F]) / 2;
+        return (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+    }
+
+    private static int getDXTColor1(int c, int a) {
+        int r = BIT5[(c & 0xFC00) >> 11];
+        int g = BIT6[(c & 0x07E0) >> 5];
+        int b = BIT5[(c & 0x001F)];
+        return (a << ARGB_ORDER.alphaShift) | (r << ARGB_ORDER.redShift) | (g << ARGB_ORDER.greenShift) | (b << ARGB_ORDER.blueShift);
+    }
+
+    private static int getDXT5Alpha(int a0, int a1, int t) {
+        if (a0 > a1) switch (t) {
+            case 0:
+                return a0;
+            case 1:
+                return a1;
+            case 2:
+                return (6 * a0 + a1) / 7;
+            case 3:
+                return (5 * a0 + 2 * a1) / 7;
+            case 4:
+                return (4 * a0 + 3 * a1) / 7;
+            case 5:
+                return (3 * a0 + 4 * a1) / 7;
+            case 6:
+                return (2 * a0 + 5 * a1) / 7;
+            case 7:
+                return (a0 + 6 * a1) / 7;
+        }
+        else switch (t) {
+            case 0:
+                return a0;
+            case 1:
+                return a1;
+            case 2:
+                return (4 * a0 + a1) / 5;
+            case 3:
+                return (3 * a0 + 2 * a1) / 5;
+            case 4:
+                return (2 * a0 + 3 * a1) / 5;
+            case 5:
+                return (a0 + 4 * a1) / 5;
+            case 6:
+                return 0;
+            case 7:
+                return 255;
+        }
+        return 0;
+    }
+
+    // RGBA Masks
+    private static final int[] A1R5G5B5_MASKS = {0x7C00, 0x03E0, 0x001F, 0x8000};
+    private static final int[] X1R5G5B5_MASKS = {0x7C00, 0x03E0, 0x001F, 0x0000};
+    private static final int[] A4R4G4B4_MASKS = {0x0F00, 0x00F0, 0x000F, 0xF000};
+    private static final int[] X4R4G4B4_MASKS = {0x0F00, 0x00F0, 0x000F, 0x0000};
+    private static final int[] R5G6B5_MASKS = {0xF800, 0x07E0, 0x001F, 0x0000};
+    private static final int[] R8G8B8_MASKS = {0xFF0000, 0x00FF00, 0x0000FF, 0x000000};
+    private static final int[] A8B8G8R8_MASKS = {0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000};
+    private static final int[] X8B8G8R8_MASKS = {0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000};
+    private static final int[] A8R8G8B8_MASKS = {0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000};
+    private static final int[] X8R8G8B8_MASKS = {0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000};
+
+    // BIT4 = 17 * index;
+    private static final int[] BIT5 = {0, 8, 16, 25, 33, 41, 49, 58, 66, 74, 82, 90, 99, 107, 115, 123, 132, 140, 148, 156, 165, 173, 181, 189, 197, 206, 214, 222, 230, 239, 247, 255};
+    private static final int[] BIT6 = {0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 45, 49, 53, 57, 61, 65, 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117, 121, 125, 130, 134, 138, 142, 146, 150, 154, 158, 162, 166, 170, 174, 178, 182, 186, 190, 194, 198, 202, 206, 210, 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, 255};
+
+    private static final class Order {
+        Order(int redShift, int greenShift, int blueShift, int alphaShift) {
+            this.redShift = redShift;
+            this.greenShift = greenShift;
+            this.blueShift = blueShift;
+            this.alphaShift = alphaShift;
+        }
+
+        public int redShift;
+        public int greenShift;
+        public int blueShift;
+        public int alphaShift;
+    }
+
+}
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2024, Paul Allen, 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.dds;
+
+enum DDSType {
+
+    DXT1(0x31545844),
+    DXT2(0x32545844),
+    DXT3(0x33545844),
+    DXT4(0x34545844),
+    DXT5(0x35545844),
+    A1R5G5B5((1 << 16) | 2),
+    X1R5G5B5((2 << 16) | 2),
+    A4R4G4B4((3 << 16) | 2),
+    X4R4G4B4((4 << 16) | 2),
+    R5G6B5((5 << 16) | 2),
+    R8G8B8((1 << 16) | 3),
+    A8B8G8R8((1 << 16) | 4),
+    X8B8G8R8((2 << 16) | 4),
+    A8R8G8B8((3 << 16) | 4),
+    X8R8G8B8((4 << 16) | 4);
+
+    private final int value;
+
+    DDSType(int value) {
+        this.value = value;
+    }
+
+    public int value() {
+        return value;
+    }
+
+    public static DDSType valueOf(int value) {
+        for (DDSType type : DDSType.values()) {
+            if (value == type.value()) {
+                return type;
+            }
+        }
+
+        throw new IllegalArgumentException(String.format("Unknown type: 0x%08x", value));
+    }
+}
@@ -0,0 +1 @@
+com.twelvemonkeys.imageio.plugins.dds.DDSImageReaderSpi
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2024, 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.dds;
+
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
+
+import javax.imageio.spi.ImageReaderSpi;
+import java.awt.Dimension;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class DDSImageReaderTest extends ImageReaderAbstractTest<DDSImageReader> {
+    @Override
+    protected ImageReaderSpi createProvider() {
+        return new DDSImageReaderSpi();
+    }
+
+    @Override
+    protected List<TestData> getTestData() {
+        Dimension dim256 = new Dimension(256, 256);
+        Dimension dim128 = new Dimension(128, 128);
+        Dimension dim64 = new Dimension(64, 64);
+        Dimension dim32 = new Dimension(32, 32);
+        Dimension dim16 = new Dimension(16, 16);
+        Dimension dim8 = new Dimension(8, 8);
+        Dimension dim4 = new Dimension(4, 4);
+        Dimension dim2 = new Dimension(2, 2);
+        Dimension dim1 = new Dimension(1, 1);
+
+        return Arrays.asList(
+                new TestData(getClassLoaderResource("/dds/dds_A1R5G5B5.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_A1R5G5B5_mipmap.dds"), dim256, dim128, dim64, dim32, dim16, dim8, dim4, dim2, dim1),
+                new TestData(getClassLoaderResource("/dds/dds_A4R4G4B4.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_A4R4G4B4_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_A8B8G8R8.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_A8B8G8R8_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_A8R8G8B8.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_A8R8G8B8_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_DXT1.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_DXT1_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_DXT2.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_DXT2_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_DXT3.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_DXT3_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_DXT4.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_DXT4_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_DXT5.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_DXT5_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_R5G6B5.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_R5G6B5_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_R8G8B8.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_R8G8B8_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_X1R5G5B5.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_X1R5G5B5_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_X4R4G4B4.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_X4R4G4B4_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_X8B8G8R8.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_X8B8G8R8_mipmap.dds"), dim256, dim128, dim64),
+                new TestData(getClassLoaderResource("/dds/dds_X8R8G8B8.dds"), dim256),
+                new TestData(getClassLoaderResource("/dds/dds_X8R8G8B8_mipmap.dds"), dim256, dim128, dim64)
+        );
+    }
+
+    @Override
+    protected List<String> getFormatNames() {
+        return Arrays.asList("DDS", "dds");
+    }
+
+    @Override
+    protected List<String> getSuffixes() {
+        return Collections.singletonList("dds");
+    }
+
+    @Override
+    protected List<String> getMIMETypes() {
+        return Collections.singletonList("image/vnd-ms.dds");
+    }
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Harald Kuhr
+ * Copyright (c) 2024, Harald Kuhr
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -28,28 +28,22 @@
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+package com.twelvemonkeys.imageio.plugins.dds;

-package com.twelvemonkeys.image;
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfoTest;

 /**
- * Magick
+ * DDSProviderInfoTest.
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/Magick.java#1 $
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: DDSProviderInfoTest.java,v 1.0 02/06/16 harald.kuhr Exp$
 */
-final class Magick {
-    static final boolean DEBUG = useDebug();
+public class DDSProviderInfoTest extends ReaderWriterProviderInfoTest {

-    private static boolean useDebug() {
-        try {
-            return "TRUE".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.image.magick.debug"));
-        }
-        catch (Throwable t) {
-            // Most probably in case of a SecurityManager
-            return false;
-        }
+    @Override
+    protected ReaderWriterProviderInfo createProviderInfo() {
+        return new DDSProviderInfo();
    }
-
-    private Magick() {}
-}
+}
@@ -25,3 +25,7 @@ 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.
+
+
+Parts of this software is based on code written by Greg Ward and Bruce Walter,
+Ported to Java and restructured by Kenneth Russell (RGBE.java).
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-hdr</artifactId>
    <name>TwelveMonkeys :: ImageIO :: HDR plugin</name>
@@ -15,7 +15,7 @@ import java.util.regex.Pattern;
 * feel free to modify it to suit your needs.
 * <p>
 * Ported to Java and restructured by Kenneth Russell.
- * posted to http://www.graphics.cornell.edu/~bjw/
+ * posted to <a href="https://www.graphics.cornell.edu/~bjw/">www.graphics.cornell.edu/~bjw/</a>
 * written by Bruce Walter  (bjw@graphics.cornell.edu)  5/26/95
 * based on code written by Greg Ward
 * </p>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-icns</artifactId>
    <name>TwelveMonkeys :: ImageIO :: ICNS plugin</name>
@@ -4,12 +4,12 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-iff</artifactId>
    <name>TwelveMonkeys :: ImageIO :: IFF plugin</name>
    <description>
-        ImageIO plugin for Amiga/Electronic Arts Interchange Filed Format (IFF)
+        ImageIO plugin for Amiga/Electronic Arts Interchange File Format (IFF)
        type ILBM and PBM format.
    </description>

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-jpeg-jai-interop</artifactId>
    <name>TwelveMonkeys :: ImageIO :: JPEG/JAI TIFF Interop</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-jpeg-jep262-interop</artifactId>
    <name>TwelveMonkeys :: ImageIO :: JPEG/JEP-262 Interop</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-jpeg</artifactId>
    <name>TwelveMonkeys :: ImageIO :: JPEG plugin</name>
@@ -53,7 +53,7 @@ final class AdobeDCT extends Application {
    final int transform;

    private AdobeDCT(int version, int flags0, int flags1, int transform) {
-        super(JPEG.APP14, "Adobe", new byte[]{'A', 'd', 'o', 'b', 'e', 0, (byte) version, (byte) (flags0 >> 8), (byte) (flags0 & 0xff), (byte) (flags1 >> 8), (byte) (flags1 & 0xff), (byte) transform});
+        super(JPEG.APP14, "Adobe", new byte[]{'A', 'd', 'o', 'b', 'e', (byte) (version >> 8), (byte) (version & 0xff), (byte) (flags0 >> 8), (byte) (flags0 & 0xff), (byte) (flags1 >> 8), (byte) (flags1 & 0xff), (byte) transform});

        this.version = version; // 100 or 101
        this.flags0 = flags0;
@@ -72,11 +72,11 @@ final class AdobeDCT extends Application {
    public static AdobeDCT read(final DataInput data, final int length) throws IOException {
        // TODO: Investigate http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6355567: 33/35 byte Adobe APP14 markers

-        data.skipBytes(6); // A, d, o, b, e, \0
+        data.skipBytes(5); // A, d, o, b, e

-        // version (byte), flags (4bytes), color transform (byte: 0=unknown, 1=YCC, 2=YCCK)
+        // version (2 bytes), flags (4bytes), color transform (byte: 0=unknown, 1=YCC, 2=YCCK)
        return new AdobeDCT(
-                data.readUnsignedByte(),
+                data.readUnsignedShort(),
                data.readUnsignedShort(),
                data.readUnsignedShort(),
                data.readUnsignedByte()
@@ -3,7 +3,7 @@
    <parent>
 	<groupId>com.twelvemonkeys.imageio</groupId>
 	<artifactId>imageio</artifactId>        
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>imageio-metadata</artifactId>
@@ -43,13 +43,17 @@ import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
 import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
-import java.awt.color.ICC_Profile;
+import java.awt.color.*;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

 import static com.twelvemonkeys.lang.Validate.notNull;

@@ -144,8 +148,10 @@ public final class JPEGSegmentUtil {
    }

    static String asNullTerminatedAsciiString(final byte[] data, final int offset) {
+        // TODO: JPEG App segment identifiers are not always 0-terminated...
+        //  Need to rewrite. For now, make sure we read only ASCII non-control chars.
        for (int i = 0; i < data.length - offset; i++) {
-            if (data[offset + i] == 0 || i > 255) {
+            if (data[offset + i] < 20 || i > 255) {
                return asAsciiString(data, offset, offset + i);
            }
        }
@@ -87,11 +87,6 @@ public final class Half extends Number implements Comparable<Half> {
        }
        else if (exponent != 0) {                   // Normalized value
            exponent += 0x1c000;                    // exp - 15 + 127
-
-            // Smooth transition
-            if (mantissa == 0 && exponent > 0x1c400) {
-                return Float.intBitsToFloat((shortBits & 0x8000) << 16 | exponent << 13 | 0x3ff);
-            }
        }
        else if (mantissa != 0) {                   // && exp == 0 -> subnormal
            exponent = 0x1c400;                     // Make it normal
@@ -1,16 +1,16 @@
 package com.twelvemonkeys.imageio.metadata.tiff;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import com.twelvemonkeys.io.FastByteArrayOutputStream;
+
+import org.junit.Test;

 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;

-import org.junit.Test;
-
-import com.twelvemonkeys.io.FastByteArrayOutputStream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;

 /**
 * HalfTest.
@@ -36,6 +36,13 @@ public class HalfTest {
        }
    }

+    @Test
+    public void testExactEncoding() {
+        for (short half = -2048; half < 2048; half++) {
+            assertEquals(String.valueOf(half), half, Half.shortBitsToFloat(Half.floatToShortBits(half)), 0);
+        }
+    }
+
    @Test
    public void testRoundTripBack() {
        for (int i = 0; i < 1024; i++) {
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-pcx</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PCX plugin</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-pdf</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PDF plugin</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-pict</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PICT plugin</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-pnm</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PNM plugin</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-psd</artifactId>
    <name>TwelveMonkeys :: ImageIO :: PSD plugin</name>
@@ -142,7 +142,8 @@ final class PSDUtil {

        @Override
        public InputStream nextElement() {
-            return new SubStream(new DecoderStream(createStreamAdapter(stream, byteCounts[index++]), new PackBitsDecoder(), rowLength), rowLength);
+            // Add 128 bytes extra buffer as worst case if the encoder (GIMP) added garbage bytes at the end
+            return new SubStream(new DecoderStream(createStreamAdapter(stream, byteCounts[index++]), new PackBitsDecoder(), rowLength + 128), rowLength);
        }
    }
 }
@@ -109,7 +109,9 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader>
                // CMYK, uncompressed + contains some uncommon MeSa (instead of 8BIM) resource blocks
                new TestData(getClassLoaderResource("/psd/fruit-cmyk-MeSa-resource.psd"), new Dimension(400, 191)),
                // 3 channel, RGB, 32 bit samples
-                new TestData(getClassLoaderResource("/psd/32bit5x5.psd"), new Dimension(5, 5))
+                new TestData(getClassLoaderResource("/psd/32bit5x5.psd"), new Dimension(5, 5)),
+                // 3 channel, RGB, written by GIMP, compressed with PackBits runs longer than the row length
+                new TestData(getClassLoaderResource("/psd/gimp-32x32-packbits-overflow.psd"), new Dimension(32, 32))
                // TODO: Need more recent ZIP compressed PSD files from CS2/CS3+
        );
    }
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-reference</artifactId>
    <name>TwelveMonkeys :: ImageIO :: JDK Reference Tests</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-sgi</artifactId>
    <name>TwelveMonkeys :: ImageIO :: SGI plugin</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-tga</artifactId>
    <name>TwelveMonkeys :: ImageIO :: TGA plugin</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-thumbsdb</artifactId>
    <name>TwelveMonkeys :: ImageIO :: Thumbs.db plugin</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-tiff-jai-interop</artifactId>
    <name>TwelveMonkeys :: ImageIO :: TIFF/JAI Metadata Interop</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-tiff-jdk-interop</artifactId>
    <name>TwelveMonkeys :: ImageIO :: TIFF/JDK JPEG Interop</name>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.imageio</groupId>
        <artifactId>imageio</artifactId>
-        <version>3.10.2-SNAPSHOT</version>
+        <version>3.12.0</version>
    </parent>
    <artifactId>imageio-tiff</artifactId>
    <name>TwelveMonkeys :: ImageIO :: TIFF plugin</name>
@@ -50,6 +50,7 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
    // See TIFF 6.0 Specification, Section 10: "Modified Huffman Compression", page 43.

    private final int columns;
+    private int rowsLeft;
    private final byte[] decodedRow;

    private final boolean optionG32D;
@@ -70,6 +71,19 @@ final class CCITTFaxDecoderStream extends FilterInputStream {

    private int lastChangingElement = 0;

+    /**
+     * Creates a CCITTFaxDecoderStream.
+     *
+     * @param stream the compressed CCITT stream.
+     * @param columns the number of columns in the stream.
+     * @param type the type of stream, must be one of {@code COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE},
+     *             {@code COMPRESSION_CCITT_T4} or {@code COMPRESSION_CCITT_T6}.
+     * @param options CCITT T.4 or T.6 options.
+     */
+    public CCITTFaxDecoderStream(final InputStream stream, final int columns, final int type, final long options) {
+        this(stream, columns, -1, type, options, type == TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE);
+    }
+
    /**
     * Creates a CCITTFaxDecoderStream.
     * This constructor may be used for CCITT streams embedded in PDF files,
@@ -82,15 +96,20 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
     * @param options CCITT T.4 or T.6 options.
     * @param byteAligned enable byte alignment used in PDF files (EncodedByteAlign).
     */
-    public CCITTFaxDecoderStream(final InputStream stream, final int columns, final int type,
-                                 final long options, final boolean byteAligned) {
+    public CCITTFaxDecoderStream(final InputStream stream, final int columns, final int type, final long options, final boolean byteAligned) {
+        this(stream, columns, -1, type, options, byteAligned);
+    }
+
+    CCITTFaxDecoderStream(final InputStream stream, final int columns, final int rows, final int type, final long options, final boolean byteAligned) {
        super(Validate.notNull(stream, "stream"));

        this.columns = Validate.isTrue(columns > 0, columns, "width must be greater than 0");
+        // -1 means as many rows the stream contains, otherwise pad up to 'rows' before EOF for compatibility with legacy CCITT streams
+        this.rowsLeft = Validate.isTrue(rows == -1 || rows > 0, rows, "height must be greater than 0");
        this.type = Validate.isTrue(type == TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE ||
-                        type == TIFFExtension.COMPRESSION_CCITT_T4 ||
-                        type == TIFFExtension.COMPRESSION_CCITT_T6,
-                type, "Only CCITT Modified Huffman RLE compression (2), CCITT T4 (3) or CCITT T6 (4) supported: %s");
+                                            type == TIFFExtension.COMPRESSION_CCITT_T4 ||
+                                            type == TIFFExtension.COMPRESSION_CCITT_T6,
+                                    type, "Only CCITT Modified Huffman RLE compression (2), CCITT T4 (3) or CCITT T6 (4) supported: %s");

        // We know this is only used for b/w (1 bit)
        decodedRow = new byte[(columns + 7) / 8];
@@ -122,21 +141,7 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
        }

        Validate.isTrue(!optionUncompressed, optionUncompressed,
-                "CCITT GROUP 3/4 OPTION UNCOMPRESSED is not supported");
-    }
-
-    /**
-     * Creates a CCITTFaxDecoderStream.
-     *
-     * @param stream the compressed CCITT stream.
-     * @param columns the number of columns in the stream.
-     * @param type the type of stream, must be one of {@code COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE},
-     *             {@code COMPRESSION_CCITT_T4} or {@code COMPRESSION_CCITT_T6}.
-     * @param options CCITT T.4 or T.6 options.
-     */
-    public CCITTFaxDecoderStream(final InputStream stream, final int columns, final int type,
-                                 final long options) {
-        this(stream, columns, type, options, type == TIFFBaseline.COMPRESSION_CCITT_MODIFIED_HUFFMAN_RLE);
+                        "CCITT GROUP 3/4 OPTION UNCOMPRESSED is not supported");
    }

    static int findCompressionType(final int encodedType, final InputStream stream) throws IOException {
@@ -209,9 +214,18 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
                    throw e;
                }

-                // ...otherwise, just let client code try to read past the
-                // end of stream
-                decodedLength = -1;
+                if (rowsLeft > 0) {
+                    // For
+                    rowsLeft--;
+
+                    Arrays.fill(decodedRow, (byte) 0);
+                    decodedLength = decodedRow.length;
+                }
+                else {
+                    // ...otherwise, just let client code try to read past the
+                    // end of stream
+                    decodedLength = -1;
+                }
            }

            decodedPos = 0;
@@ -404,7 +418,7 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
            int byteIndex = index / 8;

            while (index % 8 != 0 && (nextChange - index) > 0) {
-                decodedRow[byteIndex] |= (white ? 0 : 1 << (7 - ((index) % 8)));
+                decodedRow[byteIndex] |= (byte) (white ? 0 : 1 << (7 - ((index) % 8)));
                index++;
            }

@@ -424,7 +438,7 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
                    decodedRow[byteIndex] = 0;
                }

-                decodedRow[byteIndex] |= (white ? 0 : 1 << (7 - ((index) % 8)));
+                decodedRow[byteIndex] |= (byte) (white ? 0 : 1 << (7 - ((index) % 8)));
                index++;
            }

@@ -435,6 +449,7 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
            throw new IOException("Sum of run-lengths does not equal scan line width: " + index + " > " + columns);
        }

+        rowsLeft--;
        decodedLength = (index + 7) / 8;
    }

@@ -494,14 +509,14 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
    @Override
    public int read() throws IOException {
        if (decodedLength < 0) {
-            return 0x0;
+            return -1;
        }

        if (decodedPos >= decodedLength) {
            fetch();

            if (decodedLength < 0) {
-                return 0x0;
+                return -1;
            }
        }

@@ -511,16 +526,14 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
    @Override
    public int read(byte[] b, int off, int len) throws IOException {
        if (decodedLength < 0) {
-            Arrays.fill(b, off, off + len, (byte) 0x0);
-            return len;
+            return -1;
        }

        if (decodedPos >= decodedLength) {
            fetch();

            if (decodedLength < 0) {
-                Arrays.fill(b, off, off + len, (byte) 0x0);
-                return len;
+                return -1;
            }
        }

--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`com.twelvemonkeys.imageio.plugins.dds.DDSImageReaderSpi`