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

DefineExternalImage/2, DefineSubImage, better error handling

Browse Source
This commit is contained in:
Jindra Petřík
2022-11-05 08:50:08 +01:00
parent ea52a46ac9
commit 4e73b07bb4
4 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java
View File

@@ -104,30 +104,38 @@ public class DefineExternalImage extends ImageTag {
if (bitmapFormat == BITMAP_FORMAT_TGA) {
serImage = new SerializableImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB_PRE);
Graphics g =serImage.getGraphics();
Graphics g = serImage.getGraphics();
g.setColor(Color.red);
g.fillRect(0,0, targetWidth, targetHeight);
g.fillRect(0, 0, targetWidth, targetHeight);
return;
}
Path imagePath = sis.getSwf().getFile() == null ? null : Paths.get(sis.getSwf().getFile()).getParent().resolve(Paths.get(fileName));
if (imagePath != null && imagePath.toFile().exists()) {
byte[] imageData = Files.readAllBytes(imagePath);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
try {
byte[] imageData = Files.readAllBytes(imagePath);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
} catch (IOException ex) {
createFailedImage();
}
} else {
serImage = new SerializableImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB_PRE);
Graphics g =serImage.getGraphics();
g.setColor(Color.red);
g.fillRect(0,0, targetWidth, targetHeight);
createFailedImage();
}
}
private void createFailedImage() {
serImage = new SerializableImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB_PRE);
Graphics g = serImage.getGraphics();
g.setColor(Color.red);
g.fillRect(0, 0, targetWidth, targetHeight);
}
@Override
public void setImage(byte[] data) throws IOException {
serImage = new SerializableImage(ImageHelper.read(data));

32
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java
View File

@@ -123,22 +123,30 @@ public class DefineExternalImage2 extends ImageTag {
Path imagePath = sis.getSwf().getFile() == null ? null : Paths.get(sis.getSwf().getFile()).getParent().resolve(Paths.get(fileName));
if (imagePath != null && imagePath.toFile().exists()) {
byte[] imageData = Files.readAllBytes(imagePath);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
try {
byte[] imageData = Files.readAllBytes(imagePath);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(targetWidth, targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, 0, 0, null);
serImage = new SerializableImage(bufImage);
} catch (IOException ex) {
createFailedImage();
}
} else {
serImage = new SerializableImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB_PRE);
Graphics g = serImage.getGraphics();
g.setColor(Color.red);
g.fillRect(0, 0, targetWidth, targetHeight);
createFailedImage();
}
}
private void createFailedImage() {
serImage = new SerializableImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB_PRE);
Graphics g = serImage.getGraphics();
g.setColor(Color.red);
g.fillRect(0, 0, targetWidth, targetHeight);
}
@Override
public void setImage(byte[] data) throws IOException {
serImage = new SerializableImage(ImageHelper.read(data));

38
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineSubImage.java
View File

@@ -24,7 +24,9 @@ import com.jpexs.decompiler.flash.tags.enums.ImageFormat;
import com.jpexs.decompiler.flash.types.annotations.HideInRawEdit;
import com.jpexs.helpers.ByteArrayRange;
import com.jpexs.helpers.SerializableImage;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.io.IOException;
@@ -123,24 +125,34 @@ public class DefineSubImage extends ImageTag {
if (serImage == null) {
DefineExternalImage2 image = (DefineExternalImage2) swf.getImage(imageCharacterId | 0x8000);
Path imagePath = Paths.get(image.getSwf().getFile()).getParent().resolve(Paths.get(image.fileName));
byte[] imageData;
try {
imageData = Files.readAllBytes(imagePath);
} catch (IOException e) {
return null;
Path imagePath = image.getSwf().getFile() == null ? null : Paths.get(image.getSwf().getFile()).getParent().resolve(Paths.get(image.fileName));
if (imagePath != null && imagePath.toFile().exists()) {
try {
byte[] imageData = Files.readAllBytes(imagePath);
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(image.targetWidth, image.targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(x2 - x1, y2 - y1, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, -x1, -y1, null);
serImage = new SerializableImage(bufImage);
} catch (IOException e) {
createFailedImage();
}
} else {
createFailedImage();
}
int[] pixels = DDSReader.read(imageData, DDSReader.ARGB, 0);
BufferedImage bufImage = new BufferedImage(DDSReader.getWidth(imageData), DDSReader.getHeight(imageData), BufferedImage.TYPE_INT_ARGB);
bufImage.getRaster().setDataElements(0, 0, bufImage.getWidth(), bufImage.getHeight(), pixels);
Image scaled = bufImage.getScaledInstance(image.targetWidth, image.targetHeight, Image.SCALE_DEFAULT);
bufImage = new BufferedImage(x2 - x1, y2 - y1, BufferedImage.TYPE_INT_ARGB);
bufImage.getGraphics().drawImage(scaled, -x1, -y1, null);
serImage = new SerializableImage(bufImage);
}
return serImage;
}
private void createFailedImage() {
serImage = new SerializableImage(x2 - x1, y2 - y1, BufferedImage.TYPE_INT_ARGB_PRE);
Graphics g = serImage.getGraphics();
g.setColor(Color.red);
g.fillRect(0, 0, x2 - x1, y2 - y1);
}
@Override
public Dimension getImageDimension() {
return new Dimension(x2 - x1, y2 - y1);