From 7616611ce8d851a3b0747cccc2cdb6b06c9f8d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 27 Mar 2021 21:48:33 +0100 Subject: [PATCH] Fixed: #1669 DefineBitsJPEG3/4 alpha premultiplied --- CHANGELOG.md | 1 + .../jpexs/decompiler/flash/exporters/shape/BitmapExporter.java | 3 +++ .../com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java | 2 +- .../com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d65366f3..9912358c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. - AS decompilation - Gotos handling vs and/or - AS decompilation - certain combinations of ifs and switch - AS3 jump deobfuscator - fix for try..catch clauses +- [#1669] DefineBitsJPEG3/4 alpha premultiplied ## [14.3.1] - 2021-03-25 ### Fixed diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java index 32f5b77be..aae6b53a5 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java @@ -44,10 +44,13 @@ import java.awt.TexturePaint; import java.awt.geom.AffineTransform; import java.awt.geom.GeneralPath; import java.awt.geom.NoninvertibleTransformException; +import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import javax.imageio.ImageIO; /** * diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java index d0ac3db6a..02dd17fe6 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java @@ -213,7 +213,7 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag { int width = img.getWidth(); int height = img.getHeight(); - SerializableImage img2 = new SerializableImage(width, height, SerializableImage.TYPE_INT_ARGB_PRE); + SerializableImage img2 = new SerializableImage(width, height, SerializableImage.TYPE_INT_ARGB); int[] pixels = ((DataBufferInt) img.getRaster().getDataBuffer()).getData(); int[] pixels2 = ((DataBufferInt) img2.getRaster().getDataBuffer()).getData(); for (int i = 0; i < pixels.length; i++) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java index c4ddb2b99..a605e1708 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java @@ -215,7 +215,7 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag { int width = img.getWidth(); int height = img.getHeight(); - SerializableImage img2 = new SerializableImage(width, height, SerializableImage.TYPE_INT_ARGB_PRE); + SerializableImage img2 = new SerializableImage(width, height, SerializableImage.TYPE_INT_ARGB); int[] pixels = ((DataBufferInt) img.getRaster().getDataBuffer()).getData(); int[] pixels2 = ((DataBufferInt) img2.getRaster().getDataBuffer()).getData(); for (int i = 0; i < pixels.length; i++) {