diff --git a/lib/webp4j-1.3.1.jar b/lib/webp4j-1.3.1.jar deleted file mode 100644 index 799c6d1ae..000000000 Binary files a/lib/webp4j-1.3.1.jar and /dev/null differ diff --git a/lib/webp4j-1.4.0.jar b/lib/webp4j-1.4.0.jar new file mode 100644 index 000000000..efd3c10ad Binary files /dev/null and b/lib/webp4j-1.4.0.jar differ diff --git a/libsrc/ffdec_lib/lib/webp4j-1.3.1.jar b/libsrc/ffdec_lib/lib/webp4j-1.3.1.jar deleted file mode 100644 index 799c6d1ae..000000000 Binary files a/libsrc/ffdec_lib/lib/webp4j-1.3.1.jar and /dev/null differ diff --git a/libsrc/ffdec_lib/lib/webp4j-1.4.0.jar b/libsrc/ffdec_lib/lib/webp4j-1.4.0.jar new file mode 100644 index 000000000..efd3c10ad Binary files /dev/null and b/libsrc/ffdec_lib/lib/webp4j-1.4.0.jar differ diff --git a/libsrc/ffdec_lib/nbproject/project.xml b/libsrc/ffdec_lib/nbproject/project.xml index 4abe97c42..5c7c8f075 100644 --- a/libsrc/ffdec_lib/nbproject/project.xml +++ b/libsrc/ffdec_lib/nbproject/project.xml @@ -242,7 +242,7 @@ auxiliary.show.customizer.message= src - ../../src;lib/LZMA.jar;lib/avi.jar;lib/cmykjpeg.jar;lib/ddsreader.jar;lib/gif.jar;lib/gnujpdf.jar;lib/jlayer-1.0.2.jar;lib/jpacker.jar;lib/nellymoser.jar;lib/sfntly.jar;lib/tga.jar;lib/ttf.jar;lib/vlcj-4.7.3.jar;lib/vlcj-natives-4.7.0.jar;lib/flashdebugger.jar;lib/jna-3.5.1.jar;lib/jna-platform-3.5.1.jar;lib/gifreader.jar;lib/miterstroke.jar;lib/decimal.jar;lib/flacomdoc.jar;lib/tomlj-1.1.1.jar;lib/decimal.jar;lib/webp4j-1.3.1.jar + ../../src;lib/LZMA.jar;lib/avi.jar;lib/cmykjpeg.jar;lib/ddsreader.jar;lib/gif.jar;lib/gnujpdf.jar;lib/jlayer-1.0.2.jar;lib/jpacker.jar;lib/nellymoser.jar;lib/sfntly.jar;lib/tga.jar;lib/ttf.jar;lib/vlcj-4.7.3.jar;lib/vlcj-natives-4.7.0.jar;lib/flashdebugger.jar;lib/jna-3.5.1.jar;lib/jna-platform-3.5.1.jar;lib/gifreader.jar;lib/miterstroke.jar;lib/decimal.jar;lib/flacomdoc.jar;lib/tomlj-1.1.1.jar;lib/decimal.jar;lib/webp4j-1.4.0.jar build reports dist diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/enums/ImageFormat.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/enums/ImageFormat.java index a170301aa..1236174b8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/enums/ImageFormat.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/enums/ImageFormat.java @@ -17,7 +17,6 @@ package com.jpexs.decompiler.flash.tags.enums; import dev.matrixlab.webp4j.WebPCodec; -import java.awt.image.BufferedImage; /** * Image format. @@ -68,12 +67,7 @@ public enum ImageFormat { public boolean available() { if (this == WEBP) { - //WEBP may be unavailable on some platforms, we're gonna test sample call - try { - WebPCodec.encodeLosslessImage(new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB)); - } catch (Throwable t) { - return false; - } + return WebPCodec.isAvailable(); } return true; } diff --git a/nbproject/project.xml b/nbproject/project.xml index 7974aff60..bc7d0a301 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -329,7 +329,7 @@ src - lib/jpproxy.jar;lib/trident-6.2.jar;lib/substance-flamingo-6.2.jar;lib/flamingo-6.2.jar;lib/substance-fix.jar;lib/substance-6.2.jar;libsrc/ffdec_lib/src;lib/tablelayout.jar;lib/jsyntaxpane-0.9.5.jar;lib/JavactiveX.jar;lib/flashdebugger.jar;lib/treetable.jar;lib/minimal-json-0.9.5.jar;libsrc/ffdec_lib/lib/gnujpdf.jar;libsrc/ffdec_lib/lib/jna-3.5.1.jar;libsrc/ffdec_lib/lib/jna-platform-3.5.1.jar;libsrc/ffdec_lib/lib/flashdebugger.jar;lib/gifreader.jar;lib/jansi-2.4.0.jar;lib/decimal.jar;lib/webp4j-1.3.1.jar + lib/jpproxy.jar;lib/trident-6.2.jar;lib/substance-flamingo-6.2.jar;lib/flamingo-6.2.jar;lib/substance-fix.jar;lib/substance-6.2.jar;libsrc/ffdec_lib/src;lib/tablelayout.jar;lib/jsyntaxpane-0.9.5.jar;lib/JavactiveX.jar;lib/flashdebugger.jar;lib/treetable.jar;lib/minimal-json-0.9.5.jar;libsrc/ffdec_lib/lib/gnujpdf.jar;libsrc/ffdec_lib/lib/jna-3.5.1.jar;libsrc/ffdec_lib/lib/jna-platform-3.5.1.jar;libsrc/ffdec_lib/lib/flashdebugger.jar;lib/gifreader.jar;lib/jansi-2.4.0.jar;lib/decimal.jar;lib/webp4j-1.4.0.jar build javadoc reports