Shape export to xml fixed, ffdec.sh fixed

This commit is contained in:
honfika@gmail.com
2015-03-11 23:06:24 +01:00
parent f342d00b75
commit 35548292c7
5 changed files with 15 additions and 18 deletions

View File

@@ -994,8 +994,8 @@ public class SWFInputStream implements AutoCloseable {
sb.append(Helper.bytesToHexString(64, tag.getOriginalData(), 0));
out.println(sb.toString());
// out.println(Utils.formatHex((int)tag.getPos(), 8) + ": " + Utils.indent(level, "") + Utils.format(tag.toString(), 25 - 2*level) + " tagId="+tag.getId()+" len="+tag.getOrigDataLength()+": "+Utils.bytesToHexString(64, tag.getData(version), 0));
if (tag.hasSubTags()) {
for (Tag subTag : tag.getSubTags()) {
if (tag instanceof DefineSpriteTag) {
for (Tag subTag : ((DefineSpriteTag) tag).getSubTags()) {
dumpTag(out, version, subTag, level + 1);
}
}

View File

@@ -38,7 +38,7 @@ public class DefineShape2Tag extends ShapeTag {
@SWFType(BasicType.UI16)
public int shapeId;
private RECT shapeBounds;
public RECT shapeBounds;
public SHAPEWITHSTYLE shapes;

View File

@@ -260,14 +260,19 @@ public class DefineSpriteTag extends CharacterTag implements DrawableTag, Timeli
return baos.toByteArray();
}
@Override
public boolean hasSubTags() {
return true;
public List<Tag> getSubTags() {
return subTags;
}
@Override
public List<Tag> getSubTags() {
return subTags;
public void setModified(boolean value) {
if (!value) {
for (Tag subTag : subTags) {
subTag.setModified(false);
}
}
super.setModified(value);
}
public static void clearCache() {

View File

@@ -519,14 +519,6 @@ public abstract class Tag implements NeedsCharacters, Exportable, Serializable {
return shortLength == 0x3f;
}
public boolean hasSubTags() {
return false;
}
public List<Tag> getSubTags() {
return null;
}
public long getPos() {
if (originalRange == null) {
return -1;