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

Fixed: #2307 FLA export - image bin files generation wrong

Browse Source
This commit is contained in:
Jindra Petřík
2024-09-11 08:32:55 +02:00
parent 77f96d5ecc
commit 38e49e8dbd
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/ImageBinDataGenerator.java
View File

@@ -17,7 +17,9 @@
package com.jpexs.decompiler.flash.xfl;
import com.jpexs.decompiler.flash.tags.enums.ImageFormat;
import com.jpexs.helpers.Helper;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -35,17 +37,14 @@ import javax.imageio.ImageIO;
public class ImageBinDataGenerator {
public void generateBinData(InputStream is, OutputStream os, ImageFormat format) throws IOException {
BufferedImage bimg = ImageIO.read(is);
byte[] inputData = Helper.readStream(is);
BufferedImage bimg = ImageIO.read(new ByteArrayInputStream(inputData));
if (format == ImageFormat.JPEG) {
byte[] buf = new byte[4096];
int cnt;
while ((cnt = is.read(buf)) > 0) {
os.write(buf, 0, cnt);
}
os.write(inputData);
BinDataOutputStream dw2 = new BinDataOutputStream(os);
dw2.writeUI32(0);
dw2.writeUI32(0);
dw2.writeUI32(20 * bimg.getWidth());
dw2.writeUI32(0);
dw2.writeUI32(20 * bimg.getHeight());
} else {
//https://stackoverflow.com/questions/4082812/xfl-what-are-the-bin-dat-files/4082907#4082907

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

@@ -2062,8 +2062,8 @@ public class XFLConverter {
writer.writeAttribute("href", symbolFile);
String datFileName = "M " + (datfiles.size() + 1) + " " + getTimestamp(swf) + ".dat";
writer.writeAttribute("bitmapDataHRef", datFileName);
writer.writeAttribute("frameRight", image.getWidth());
writer.writeAttribute("frameBottom", image.getHeight());
writer.writeAttribute("frameRight", (int) (image.getWidth() * SWF.unitDivisor));
writer.writeAttribute("frameBottom", (int) (image.getHeight() * SWF.unitDivisor));
writer.writeEndElement();
ImageBinDataGenerator ibg = new ImageBinDataGenerator();