diff --git a/komga/build.gradle.kts b/komga/build.gradle.kts index 925c7df2f..ecf086101 100644 --- a/komga/build.gradle.kts +++ b/komga/build.gradle.kts @@ -68,9 +68,9 @@ dependencies { implementation("org.jsoup:jsoup:1.13.1") implementation("net.coobird:thumbnailator:0.4.13") - runtimeOnly("com.twelvemonkeys.imageio:imageio-jpeg:3.6.4") - runtimeOnly("com.twelvemonkeys.imageio:imageio-tiff:3.6.4") - runtimeOnly(files("$projectDir/libs/webp-imageio-decoder-plugin-0.2.jar")) + runtimeOnly("com.twelvemonkeys.imageio:imageio-jpeg:3.7.0") + runtimeOnly("com.twelvemonkeys.imageio:imageio-tiff:3.7.0") + runtimeOnly("com.twelvemonkeys.imageio:imageio-webp:3.7.0") implementation("com.github.gotson:webp-imageio:0.2.0") // support for jpeg2000 runtimeOnly("com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0") diff --git a/komga/libs/webp-imageio-decoder-plugin-0.2.jar b/komga/libs/webp-imageio-decoder-plugin-0.2.jar deleted file mode 100644 index 9fa29e38d..000000000 Binary files a/komga/libs/webp-imageio-decoder-plugin-0.2.jar and /dev/null differ diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt index 6c8cdc80a..a97e87b66 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt @@ -23,8 +23,16 @@ class ImageConverter { init { val registry = IIORegistry.getDefaultInstance() - val nativeWebp = registry.getServiceProviderByClass(Class.forName("com.luciad.imageio.webp.WebPImageReaderSpi")) as ImageReaderSpi? - val javaWebp = registry.getServiceProviderByClass(Class.forName("net.sf.javavp8decoder.imageio.WebPImageReaderSpi")) as ImageReaderSpi? + val nativeWebp = try { + registry.getServiceProviderByClass(Class.forName("com.luciad.imageio.webp.WebPImageReaderSpi")) + } catch (e: Exception) { + null + } as ImageReaderSpi? + val javaWebp = try { + registry.getServiceProviderByClass(Class.forName("com.twelvemonkeys.imageio.plugins.webp.WebPImageReaderSpi")) + } catch (e: Exception) { + null + } as ImageReaderSpi? if (nativeWebp != null) { if (!WebP.loadNativeLibrary()) {