Skip to content

Commit b319b75

Browse files
committed
specify minSdk due to use of ImageDecoder
1 parent adf90f9 commit b319b75

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ android {
3030
namespace = group.toString().replace('-', '.')
3131
ndkVersion = "21.4.7075529"
3232

33+
defaultConfig {
34+
minSdk = 28
35+
}
36+
3337
sourceSets {
3438
getByName("debug").jniLibs.srcDirs(project.layout.buildDirectory.dir("generated/jni/Debug"))
3539
getByName("release").jniLibs.srcDirs(project.layout.buildDirectory.dir("generated/jni/Release"))

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ package com.martmists.ndarray.simd.compat
55
import android.graphics.Bitmap
66
import android.graphics.ImageDecoder
77
import com.martmists.ndarray.simd.F64Array
8-
import com.martmists.ndarray.simd.F64Array.Companion.invoke
98
import com.martmists.ndarray.simd.F64ImageArray
10-
import com.sksamuel.scrimage.ImmutableImage
11-
import com.sksamuel.scrimage.nio.JpegWriter
12-
import com.sksamuel.scrimage.nio.PngWriter
13-
import com.sksamuel.scrimage.webp.WebpWriter
14-
import java.awt.image.BufferedImage
15-
import java.awt.image.DataBufferByte
169
import java.io.File
10+
import java.nio.ByteBuffer
1711

1812
private fun Int.asColorDouble(): Double = (if (this < 0) 256 + this else this) / 255.0
1913

@@ -105,5 +99,5 @@ actual fun F64Array.Companion.fromImage(file: File): F64ImageArray {
10599
* @since 1.7.0
106100
*/
107101
actual fun F64Array.Companion.fromImage(file: ByteArray): F64ImageArray {
108-
return fromImage(ImageDecoder.decodeBitmap(ImageDecoder.createSource(file)))
102+
return fromImage(ImageDecoder.decodeBitmap(ImageDecoder.createSource(ByteBuffer.wrap(file))))
109103
}

0 commit comments

Comments
 (0)