LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-31 19:54:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed Auto fixing character tags order based on dependencies during saving

Browse Source
This commit is contained in:
Jindra Petřík
2022-11-06 17:02:36 +01:00
parent 338dcd5584
commit daff6f8c18
2 changed files with 5 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -811,51 +811,7 @@ public final class SWF implements SWFContainerItem, Timelined {
}
return null;
}
public void fixCharactersOrder(boolean checkAll) {
Set<Integer> addedCharacterIds = new HashSet<>();
Set<CharacterTag> movedTags = new HashSet<>();
for (int i = 0; i < tags.size(); i++) {
Tag tag = tags.get(i);
if (checkAll || tag.isModified()) {
Set<Integer> needed = new HashSet<>();
tag.getNeededCharacters(needed);
if (tag instanceof CharacterTag) {
CharacterTag characterTag = (CharacterTag) tag;
needed.remove(characterTag.getCharacterId());
}
boolean moved = false;
for (Integer id : needed) {
if (!addedCharacterIds.contains(id)) {
CharacterTag neededCharacter = getCharacter(id);
if (neededCharacter == null) {
continue;
}
if (movedTags.contains(neededCharacter)) {
logger.log(Level.SEVERE, "Fixing characters order failed, recursion detected.");
return;
}
// move the needed character to the current position
tags.remove(neededCharacter);
tags.add(i, neededCharacter);
movedTags.add(neededCharacter);
moved = true;
}
}
if (moved) {
i--;
continue;
}
}
if (tag instanceof CharacterTag) {
addedCharacterIds.add(((CharacterTag) tag).getCharacterId());
}
}
}
}
public void resetTimelines(Timelined timelined) {
timelined.resetTimeline();
@@ -1007,9 +963,7 @@ public final class SWF implements SWFContainerItem, Timelined {
return saveToByteArray(gfx);
}
private byte[] saveToByteArray(boolean gfx) throws IOException {
fixCharactersOrder(false);
private byte[] saveToByteArray(boolean gfx) throws IOException {
byte[] data;
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
SWFOutputStream sos = new SWFOutputStream(baos, version)) {