Cherry-pick from BTEUK: use java.awt.image instead of sun.awt.image

SmylerMC · Jan 4, 2025 · 4e16ae6 · 4e16ae6
1 parent 31a707c
commit 4e16ae6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,6 @@ plugins {
 
 compileJava {
     sourceCompatibility = targetCompatibility = "17"
-    options.compilerArgs << '--add-exports=java.desktop/sun.awt.image=ALL-UNNAMED'
 }
 
 version = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim().replace("/", "-") + "-SNAPSHOT"

diff --git a/src/main/java/net/buildtheearth/terraminusminus/config/scalarparse/d/ParseTiffAutoDSP.java b/src/main/java/net/buildtheearth/terraminusminus/config/scalarparse/d/ParseTiffAutoDSP.java
@@ -18,9 +18,9 @@
 import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
 import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
 import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
-import sun.awt.image.IntegerComponentRaster;
 
 import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferInt;
 import java.io.IOException;
 import java.util.Collections;
 
@@ -144,7 +144,7 @@ public boolean isRaw() {
                 throw new IllegalArgumentException("unsupported sample format: " + sampleFormat);
         }
 
-        int[] src = ((IntegerComponentRaster) img.getRaster()).getDataStorage();
+        int[] src = ((DataBufferInt)img.getRaster().getDataBuffer()).getData();
         checkArg(src.length == dst.length, "data length invalid?!?");
         for (int i = 0; i < dst.length; i++) {
             dst[i] = (src[i] & mask) << shift >> shift;