LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-12 01:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

make getImage protected (use getImageCached)

Browse Source
This commit is contained in:
honfika@gmail.com
2016-05-04 09:20:23 +02:00
parent 6019aec7d2
commit fdf827b4db
8 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java
View File

@@ -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) {

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java
View File

@@ -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;

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java
View File

@@ -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;

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java
View File

@@ -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;
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java
View File

@@ -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();

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java
View File

@@ -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 {

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java
View File

@@ -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();

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
View File

@@ -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);