diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c4f8b20d..ebbe382db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. - SVG export - video frames - [#2592], [#2154], [#2591], [#2596] - Better handling of antialias conflation artifacts (by scaling), can be enabled in Advanced Settings / Display and Export. +- [#2608] Updated WEBP image library so now it supports macOS x64 ### Fixed - [#2570] NullpointerException on SVG export of DefineEditText @@ -4077,6 +4078,7 @@ Major version of SWF to XML export changed to 2. [#2154]: https://www.free-decompiler.com/flash/issues/2154 [#2591]: https://www.free-decompiler.com/flash/issues/2591 [#2596]: https://www.free-decompiler.com/flash/issues/2596 +[#2608]: https://www.free-decompiler.com/flash/issues/2608 [#2570]: https://www.free-decompiler.com/flash/issues/2570 [#2571]: https://www.free-decompiler.com/flash/issues/2571 [#2575]: https://www.free-decompiler.com/flash/issues/2575 diff --git a/lib/webp4j-1.2.0.jar b/lib/webp4j-1.2.0.jar deleted file mode 100644 index 0f3f03ae4..000000000 Binary files a/lib/webp4j-1.2.0.jar and /dev/null differ diff --git a/lib/webp4j-1.3.1.jar b/lib/webp4j-1.3.1.jar new file mode 100644 index 000000000..799c6d1ae Binary files /dev/null and b/lib/webp4j-1.3.1.jar differ diff --git a/libsrc/ffdec_lib/lib/webp4j-1.2.0.jar b/libsrc/ffdec_lib/lib/webp4j-1.2.0.jar deleted file mode 100644 index 0f3f03ae4..000000000 Binary files a/libsrc/ffdec_lib/lib/webp4j-1.2.0.jar and /dev/null differ diff --git a/libsrc/ffdec_lib/lib/webp4j-1.3.1.jar b/libsrc/ffdec_lib/lib/webp4j-1.3.1.jar new file mode 100644 index 000000000..799c6d1ae Binary files /dev/null and b/libsrc/ffdec_lib/lib/webp4j-1.3.1.jar differ diff --git a/libsrc/ffdec_lib/nbproject/project.xml b/libsrc/ffdec_lib/nbproject/project.xml index c95b273f5..4abe97c42 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.2.0.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.3.1.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 9cefdf54e..6f815c0e7 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 @@ -16,8 +16,8 @@ */ package com.jpexs.decompiler.flash.tags.enums; -import dev.matrixlab.webp4j.NativeWebP; import dev.matrixlab.webp4j.WebPCodec; +import java.awt.image.BufferedImage; /** * Image format. @@ -67,8 +67,9 @@ public enum ImageFormat { public boolean available() { if (this == WEBP) { - try { - new NativeWebP(); + //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; } diff --git a/nbproject/project.xml b/nbproject/project.xml index d437d13b9..7974aff60 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.2.0.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.3.1.jar build javadoc reports