From fdf827b4db90659b0f4c879e1d2046a089eac3d1 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 4 May 2016 09:20:23 +0200 Subject: [PATCH] make getImage protected (use getImageCached) --- .../com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java | 2 +- .../com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java | 3 +-- .../com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java | 3 +-- .../jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java | 3 +-- .../jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java | 2 +- .../src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java | 2 +- .../src/com/jpexs/decompiler/flash/tags/base/ImageTag.java | 4 +--- .../src/com/jpexs/decompiler/flash/xfl/XFLConverter.java | 2 +- 8 files changed, 8 insertions(+), 13 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java index b6117b574..a8bfbf15e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java @@ -130,7 +130,7 @@ public class DefineBitsJPEG2Tag extends ImageTag implements AloneTag { } @Override - public SerializableImage getImage() { + protected SerializableImage getImage() { try { BufferedImage image = ImageHelper.read(getOriginalImageData()); if (image == null) { 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 b04c475d8..26a3571e8 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 @@ -181,7 +181,7 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag { } @Override - public SerializableImage getImage() { + protected SerializableImage getImage() { try { int errorLength = hasErrorHeader(imageData) ? 4 : 0; ByteArrayInputStream bis = new ByteArrayInputStream(imageData.getArray(), imageData.getPos() + errorLength, imageData.getLength() - errorLength); @@ -192,7 +192,6 @@ public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag { return null; } - //image = ensurePreMultipled(image, preMultiplyApha); SerializableImage img = new SerializableImage(image); if (bitmapAlphaData.getLength() == 0) { return img; 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 1a7619917..faf3db015 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 @@ -185,7 +185,7 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag { } @Override - public SerializableImage getImage() { + protected SerializableImage getImage() { try { BufferedImage image = ImageHelper.read(new ByteArrayInputStream(imageData.getArray(), imageData.getPos(), imageData.getLength())); if (image == null) { @@ -193,7 +193,6 @@ public class DefineBitsJPEG4Tag extends ImageTag implements AloneTag { return null; } - //image = ensurePreMultipled(image, preMultiplyApha); SerializableImage img = new SerializableImage(image); if (bitmapAlphaData.getLength() == 0) { return img; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java index 9c9f0f411..e4a00baca 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java @@ -233,7 +233,7 @@ public class DefineBitsLossless2Tag extends ImageTag implements AloneTag { } @Override - public SerializableImage getImage() { + protected SerializableImage getImage() { SerializableImage bi = new SerializableImage(bitmapWidth, bitmapHeight, SerializableImage.TYPE_INT_ARGB_PRE); int[] pixels = ((DataBufferInt) bi.getRaster().getDataBuffer()).getData(); @@ -269,7 +269,6 @@ public class DefineBitsLossless2Tag extends ImageTag implements AloneTag { } } - //bi.getRaster().setDataElements(0, 0, bitmapWidth, bitmapHeight, pixels); return bi; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java index 21abf8e8b..65f0b5125 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java @@ -228,7 +228,7 @@ public class DefineBitsLosslessTag extends ImageTag implements AloneTag { } @Override - public SerializableImage getImage() { + protected SerializableImage getImage() { int[] pixels = new int[bitmapWidth * bitmapHeight]; if (bitmapFormat == DefineBitsLosslessTag.FORMAT_8BIT_COLORMAPPED) { COLORMAPDATA colorMapData = getColorMapData(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java index 1de3724db..c27b229fd 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java @@ -137,7 +137,7 @@ public class DefineBitsTag extends ImageTag implements TagChangedListener { } @Override - public SerializableImage getImage() { + protected SerializableImage getImage() { InputStream imageStream = getOriginalImageData(); if (imageStream != null) { try { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java index 47a2b26e7..95f970266 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java @@ -43,8 +43,6 @@ import com.jpexs.helpers.ByteArrayRange; import com.jpexs.helpers.SerializableImage; import java.awt.Dimension; import java.awt.Shape; -import java.awt.image.BufferedImage; -import java.awt.image.DataBufferInt; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -69,7 +67,7 @@ public abstract class ImageTag extends DrawableTag { public abstract InputStream getOriginalImageData(); - public abstract SerializableImage getImage(); + protected abstract SerializableImage getImage(); public abstract Dimension getImageDimension(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index c22aed2c1..640dd8f6e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -1469,7 +1469,7 @@ public class XFLConverter { } byte imageBytes[] = Helper.readStream(imageTag.getImageData()); - SerializableImage image = imageTag.getImage(); + SerializableImage image = imageTag.getImageCached(); ImageFormat format = imageTag.getImageFormat(); String symbolFile = "bitmap" + symbol.getCharacterId() + imageTag.getImageFormat().getExtension(); files.put(symbolFile, imageBytes);