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

#916 Replacing "Shape" will corrupt the SWF

Browse Source
This commit is contained in:
honfika@gmail.com
2015-06-15 12:48:16 +02:00
parent 3356bf2b28
commit 3d7fc59a3f
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/ShapeImporter.java
View File

@@ -19,7 +19,9 @@ package com.jpexs.decompiler.flash.importers;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.helpers.ImageHelper;
import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag;
import com.jpexs.decompiler.flash.tags.DefineBitsLossless2Tag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.base.ImageTag;
import com.jpexs.decompiler.flash.tags.base.ShapeTag;
import com.jpexs.decompiler.flash.tags.enums.ImageFormat;
import com.jpexs.decompiler.flash.types.SHAPEWITHSTYLE;
@@ -43,18 +45,26 @@ public class ShapeImporter {
newData = baos.toByteArray();
}
DefineBitsJPEG2Tag jpeg2Tag = new DefineBitsJPEG2Tag(swf, null, swf.getNextCharacterId(), newData);
jpeg2Tag.setModified(true);
ImageTag imageTag;
if (ImageTag.getImageFormat(newData) == ImageFormat.JPEG) {
DefineBitsJPEG2Tag jpeg2Tag = new DefineBitsJPEG2Tag(swf, null, swf.getNextCharacterId(), newData);
imageTag = jpeg2Tag;
} else {
DefineBitsLossless2Tag lossless2Tag = new DefineBitsLossless2Tag(swf);
lossless2Tag.setImage(newData);
imageTag = lossless2Tag;
}
int idx = swf.tags.indexOf(st);
if (idx != -1) {
swf.tags.add(idx, jpeg2Tag);
swf.tags.add(idx, imageTag);
} else {
swf.tags.add(jpeg2Tag);
swf.tags.add(imageTag);
}
swf.updateCharacters();
st.setModified(true);
SHAPEWITHSTYLE shapes = jpeg2Tag.getShape(st.getRect(), true);
SHAPEWITHSTYLE shapes = imageTag.getShape(st.getRect(), true);
st.shapes = shapes;
return (Tag) st;

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/UnknownTag.java
View File

@@ -27,6 +27,8 @@ import java.io.IOException;
*/
public class UnknownTag extends Tag {
private ByteArrayRange unknownData;
public UnknownTag(SWFInputStream sis, int id, ByteArrayRange data) throws IOException {
super(sis.getSwf(), id, "Unknown", data);
readData(sis, data, 0, false, false, false);
@@ -34,6 +36,7 @@ public class UnknownTag extends Tag {
@Override
public final void readData(SWFInputStream sis, ByteArrayRange data, int level, boolean parallel, boolean skipUnusualTags, boolean lazy) throws IOException {
unknownData = new ByteArrayRange(data.getArray(), (int) sis.getPos(), sis.available());
sis.skipBytes(sis.available());
}
@@ -45,7 +48,7 @@ public class UnknownTag extends Tag {
*/
@Override
public void getData(SWFOutputStream sos) throws IOException {
sos.write(getOriginalRange().getRangeData());
sos.write(unknownData);
}
@Override