check color channels in BufferedImage

Author: Martmists-GH

README.md

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.martmists.ndarray-simd:ndarray-simd:1.5.0")
+    implementation("com.martmists.ndarray-simd:ndarray-simd:1.5.1")
 }
 ```
 

build.gradle.kts

@@ -17,7 +17,7 @@ plugins {
 }
 
 group = "com.martmists.ndarray-simd"
-version = "1.5.0"
+version = "1.5.1"
 val isProduction = (findProperty("production") ?: System.getProperty("production")) != null
 
 repositories {

src/desktopMain/kotlin/com/martmists/ndarray/simd/compat/image.kt

@@ -30,6 +30,11 @@ fun F64Array.Companion.fromImage(img: BufferedImage): F64ImageArray {
     val h = img.height
     val hasAlpha = img.alphaRaster != null
     val pxData = (img.raster.dataBuffer as DataBufferByte).data
+    val (r, g, b) = when (img.type) {
+        BufferedImage.TYPE_INT_RGB, BufferedImage.TYPE_INT_ARGB -> Triple(0, 1, 2)
+        BufferedImage.TYPE_INT_BGR, BufferedImage.TYPE_3BYTE_BGR, BufferedImage.TYPE_4BYTE_ABGR -> Triple(2, 1, 0)
+        else -> throw UnsupportedOperationException("Unknown image type ${img.type}, please open an issue!")
+    }
     val arr = F64Array(w, h, 4).image
     val pxSize = if (hasAlpha) 4 else 3
 
@@ -38,14 +43,14 @@ fun F64Array.Companion.fromImage(img: BufferedImage): F64ImageArray {
             val idx = (x + y * w) * pxSize
             if (hasAlpha) {
                 arr[x, y, 3] = pxData[idx].toInt().asColorDouble()
-                arr[x, y, 0] = pxData[idx + 1].toInt().asColorDouble()
-                arr[x, y, 1] = pxData[idx + 2].toInt().asColorDouble()
-                arr[x, y, 2] = pxData[idx + 3].toInt().asColorDouble()
+                arr[x, y, r] = pxData[idx + 1].toInt().asColorDouble()
+                arr[x, y, g] = pxData[idx + 2].toInt().asColorDouble()
+                arr[x, y, b] = pxData[idx + 3].toInt().asColorDouble()
             } else {
                 arr[x, y, 3] = 1.0
-                arr[x, y, 0] = pxData[idx].toInt().asColorDouble()
-                arr[x, y, 1] = pxData[idx + 1].toInt().asColorDouble()
-                arr[x, y, 2] = pxData[idx + 2].toInt().asColorDouble()
+                arr[x, y, r] = pxData[idx].toInt().asColorDouble()
+                arr[x, y, g] = pxData[idx + 1].toInt().asColorDouble()
+                arr[x, y, b] = pxData[idx + 2].toInt().asColorDouble()
             }
         }
     }