LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-15 09:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge

Browse Source
This commit is contained in:
Jindra Petřík
2026-05-03 13:28:17 +02:00
parent e610dc71be 48fad13268
commit 772bd9f0bc
22 changed files with 280 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java
View File

@@ -24,21 +24,20 @@ import com.jpexs.flash.fla.converter.FlaFormatVersion;
* @author JPEXS
*/
public enum FLAVersion {
F5("F5", "Flash 5", FlaFormatVersion.F5, null, 5),
MX("MX", "Flash MX", FlaFormatVersion.MX, null, 6),
MX2004("MX2004", "Flash MX 2004", FlaFormatVersion.MX2004, null, 7),
F8("F8", "Flash 8", FlaFormatVersion.F8, null, 8),
CS3("CS3", "Flash CS 3", FlaFormatVersion.CS3, null, 9),
CS4("CS4", "Flash CS 4", FlaFormatVersion.CS4, null, 10),
CS5("CS5", "Flash CS 5", null, "2.0", 10),
CS5_5("CS5.5", "Flash CS 5.5", null, "2.1", 11),
CS6("CS6", "Flash CS 6", null, "2.2", 17),
CC("CC", "Flash CC", null, "2.4", Integer.MAX_VALUE) {
@Override
public int minASVersion() {
return 3; //AS 1/2 not supported anymore
}
};
F1("F1", "FutureSplash Animator", FlaFormatVersion.F1, null, 1, 1, 1),
F2("F2", "Macromedia Flash 2", FlaFormatVersion.F2, null, 2, 1, 1),
F3("F3", "Macromedia Flash 3", FlaFormatVersion.F3, null, 3, 1, 1),
F4("F4", "Macromedia Flash 4", FlaFormatVersion.F4, null, 4, 1, 1),
F5("F5", "Macromedia Flash 5", FlaFormatVersion.F5, null, 5, 1, 1),
MX("MX", "Macromedia Flash MX", FlaFormatVersion.MX, null, 6, 1, 1),
MX2004("MX2004", "Macromedia Flash MX 2004", FlaFormatVersion.MX2004, null, 7, 1, 2),
F8("F8", "Macromedia Flash 8", FlaFormatVersion.F8, null, 8, 1, 2),
CS3("CS3", "Adobe Flash Professional CS 3", FlaFormatVersion.CS3, null, 9, 1, 3),
CS4("CS4", "Adobe Flash Professional CS 4", FlaFormatVersion.CS4, null, 10, 1, 3),
CS5("CS5", "Adobe Flash Professional CS 5", null, "2.0", 10, 1, 3),
CS5_5("CS5.5", "Adobe Flash Professional CS 5.5", null, "2.1", 11, 1, 3),
CS6("CS6", "Adobe Flash Professional CS 6", null, "2.2", 17, 1, 3),
CC("CC", "Adobe Flash Professional CC", null, "2.4", Integer.MAX_VALUE, 3, 3);
private final FlaFormatVersion cfbFlaVersion;
private final String xflVersion;
@@ -48,13 +47,19 @@ public enum FLAVersion {
private final String applicationName;
private final int maxSwfVersion;
private final int minASVersion;
private FLAVersion(String shortName, String applicationName, FlaFormatVersion cfbFlaVersion, String xflVersion, int maxSwfVersion) {
private final int maxASVersion;
private FLAVersion(String shortName, String applicationName, FlaFormatVersion cfbFlaVersion, String xflVersion, int maxSwfVersion, int minASVersion, int maxASVersion) {
this.cfbFlaVersion = cfbFlaVersion;
this.xflVersion = xflVersion;
this.shortName = shortName;
this.applicationName = applicationName;
this.maxSwfVersion = maxSwfVersion;
this.minASVersion = minASVersion;
this.maxASVersion = maxASVersion;
}
public FlaFormatVersion getCfbFlaVersion() {
@@ -70,7 +75,11 @@ public enum FLAVersion {
}
public int minASVersion() {
return 1;
return minASVersion;
}
public int maxASVersion() {
return maxASVersion;
}
public String applicationName() {

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/LosslessImageBinDataReader.java
View File

@@ -118,6 +118,10 @@ public class LosslessImageBinDataReader {
g = (int) Math.floor(g * 256f / a);
b = (int) Math.floor(b * 256f / a);
}
if (!hasAlpha) {
a = 0xFF;
}
int rgba = r + (g << 8) + (b << 16) + (a << 24);
img.setRGB(x, y, rgba);
@@ -143,9 +147,9 @@ public class LosslessImageBinDataReader {
}
public static void main(String[] args) throws IOException {
File f = new File("in.bin");
File f = new File("c:\\Dropbox\\Programovani\\JavaSE\\FlaComDoc\\out\\media\\M 6 1776533974.dat");
LosslessImageBinDataReader r = new LosslessImageBinDataReader(new FileInputStream(f));
BufferedImage i = r.readImage();
ImageIO.write(i, "PNG", new File("out.png"));
ImageIO.write(i, "PNG", new File("c:\\Dropbox\\Programovani\\JavaSE\\FlaComDoc\\out\\media\\out.png"));
}
}