Merge pull request #112 from usefulness/fix_initialization

usefulness · Jul 2, 2023 · 45948e9 · 45948e9
2 parents 98c618d + 43ed90d
commit 45948e9
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 16 deletions.
diff --git a/webp-imageio/src/main/kotlin/com/luciad/imageio/webp/internal/WebPWrapper.kt b/webp-imageio/src/main/kotlin/com/luciad/imageio/webp/internal/WebPWrapper.kt
@@ -16,6 +16,10 @@ internal object WebPWrapper {
 
     private var NATIVE_LIBRARY_LOADED = false
 
+    init {
+        loadNativeLibrary()
+    }
+
     @JvmStatic
     @Synchronized
     fun loadNativeLibrary() {

diff --git a/webp-imageio/src/test/kotlin/com/luciad/imageio/webp/SimpleTest.kt b/webp-imageio/src/test/kotlin/com/luciad/imageio/webp/SimpleTest.kt
@@ -0,0 +1,20 @@
+package com.luciad.imageio.webp
+
+import com.luciad.imageio.webp.utils.readImage
+import com.luciad.imageio.webp.utils.readResource
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class SimpleTest {
+
+    /**
+     * For some reason this reproduces the issue from https://github.com/usefulness/webp-imageio/issues/111
+     */
+    @Test
+    fun readLossy() {
+        val image = readImage(readResource("lossy.webp"))
+
+        assertThat(image.width).isEqualTo(1024)
+        assertThat(image.height).isEqualTo(752)
+    }
+}
diff --git a/webp-imageio/src/test/kotlin/com/luciad/imageio/webp/WebPTest.kt b/webp-imageio/src/test/kotlin/com/luciad/imageio/webp/WebPTest.kt
@@ -1,5 +1,11 @@
 package com.luciad.imageio.webp
 
+import com.luciad.imageio.webp.utils.getResourceStream
+import com.luciad.imageio.webp.utils.readImage
+import com.luciad.imageio.webp.utils.readResource
+import com.luciad.imageio.webp.utils.requireWebpImageReader
+import com.luciad.imageio.webp.utils.requireWebpImageWriter
+import com.luciad.imageio.webp.utils.writeWebpImage
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir

diff --git a/webp-imageio/src/test/kotlin/com/luciad/imageio/webp/utils/ResourcesLoader.kt b/webp-imageio/src/test/kotlin/com/luciad/imageio/webp/utils/ResourcesLoader.kt
@@ -0,0 +1,16 @@
+package com.luciad.imageio.webp.utils
+
+import java.io.ByteArrayOutputStream
+
+private object ResourcesLoader
+
+internal fun readResource(resource: String) = getResourceStream(resource).use { stream ->
+    ByteArrayOutputStream().use { out ->
+        stream.copyTo(out)
+        out.toByteArray()
+    }
+}
+
+internal fun getResourceStream(resource: String) = checkNotNull(ResourcesLoader::class.java.classLoader.getResourceAsStream(resource)) {
+    "Could not load resource $resource"
+}
diff --git a/...tlin/com/luciad/imageio/webp/TestUtils.kt → ...om/luciad/imageio/webp/utils/TestUtils.kt b/...tlin/com/luciad/imageio/webp/TestUtils.kt → ...om/luciad/imageio/webp/utils/TestUtils.kt
@@ -1,8 +1,10 @@
-package com.luciad.imageio.webp
+package com.luciad.imageio.webp.utils
 
+import com.luciad.imageio.webp.WebPImageReaderSpi
+import com.luciad.imageio.webp.WebPImageWriterSpi
+import com.luciad.imageio.webp.WebPWriteParam
 import java.awt.image.BufferedImage
 import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
 import java.io.File
 import javax.imageio.IIOImage
 import javax.imageio.ImageIO
@@ -16,20 +18,7 @@ import javax.imageio.stream.MemoryCacheImageInputStream
 internal fun Iterator<ImageReader>.requireWebpImageReader() = asSequence().single { it.originatingProvider is WebPImageReaderSpi }
 internal fun Iterator<ImageWriter>.requireWebpImageWriter() = asSequence().single { it.originatingProvider is WebPImageWriterSpi }
 
-private object ResourcesLoader
-
-internal fun readResource(resource: String) = getResourceStream(resource).use { stream ->
-    ByteArrayOutputStream().use { out ->
-        stream.copyTo(out)
-        out.toByteArray()
-    }
-}
-
-internal fun getResourceStream(resource: String) = checkNotNull(ResourcesLoader::class.java.classLoader.getResourceAsStream(resource)) {
-    "Could not load resource $resource"
-}
-
-internal fun readImage(webp: ByteArray, param: ImageReadParam? = null) = checkNotNull(getImageReader(webp))
+internal fun readImage(webp: ByteArray, param: ImageReadParam? = null) = getImageReader(webp)
     .apply { input = MemoryCacheImageInputStream(ByteArrayInputStream(webp)) }
     .read(0, param)