LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 06:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed GFX - DefineExternalImage2 display and correct handling if standalone

Browse Source
This commit is contained in:
Jindra Petřík
2023-01-01 21:43:04 +01:00
parent 9e572d00a3
commit 3661e0466c
5 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java
+1 -1
View File
@@ -306,5 +306,5 @@ public abstract class ImageTag extends DrawableTag {
@Override
public RECT getRectWithStrokes() {
return getRect();
}
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java
+14 -2
View File
@@ -49,6 +49,15 @@ public class DefineExternalImage2 extends ImageTag {
public int imageID;
public static final int UNKNOWN_IS_STANDALONE = 0;
public static final int UNKNOWN_HAS_SUBIMAGES = 9;
/**
* Special unknown field.
* This seems to have value of 9 when it has DefineSubImages and in this case,
* imageId is not treated as a characterId.
* If it has value of 0, this tag is threated as standalone external image - standard character.
*/
public int unknownID;
public int bitmapFormat;
@@ -105,7 +114,7 @@ public class DefineExternalImage2 extends ImageTag {
public DefineExternalImage2(SWFInputStream sis, ByteArrayRange data) throws IOException {
super(sis.getSwf(), ID, NAME, data);
readData(sis, data, 0, false, false, false);
characterID = -1;
characterID = unknownID == 0 ? imageID : - 1;
}
public DefineExternalImage2(SWF swf) {
@@ -114,7 +123,7 @@ public class DefineExternalImage2 extends ImageTag {
fileName = "";
targetWidth = 1;
targetHeight = 1;
unknownID = 9; //?
unknownID = UNKNOWN_HAS_SUBIMAGES;
bitmapFormat = BITMAP_FORMAT_DDS;
characterID = -1;
createFailedImage();
@@ -223,6 +232,9 @@ public class DefineExternalImage2 extends ImageTag {
@Override
public String toString() {
if (unknownID == 0) {
return super.toString();
}
return tagName + " (i" + imageID + ")";
}