From 618c7d477a2d9b48a0a405ef4888627958dab15a Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Fri, 24 Jul 2015 13:28:30 +0200 Subject: [PATCH] #1000 Images export fails for malformed JPEG3 tags fixed --- .../com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java | 4 ++++ .../com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java | 4 ++++ 2 files changed, 8 insertions(+) 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 982e6396c..779712dc4 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 @@ -192,6 +192,10 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag { } byte[] alphaData = getImageAlpha(); + if (alphaData.length == 0) { + return img; + } + int[] pixels = ((DataBufferInt) img.getRaster().getDataBuffer()).getData(); for (int i = 0; i < pixels.length; i++) { int a = alphaData[i] & 0xff; 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 c78e5d3e3..a81b231f5 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 @@ -193,6 +193,10 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag { } byte[] alphaData = getImageAlpha(); + if (alphaData.length == 0) { + return img; + } + int[] pixels = ((DataBufferInt) img.getRaster().getDataBuffer()).getData(); for (int i = 0; i < pixels.length; i++) { int a = alphaData[i] & 0xff;