From 1fa6a699884d6d873aed7bafb1e2a264030febc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Mon, 28 Nov 2016 19:19:46 +0100 Subject: [PATCH] read fix - hdr problems --- .../src/com/jpexs/decompiler/flash/iggy/IggyFile.java | 10 +++++----- .../src/com/jpexs/decompiler/flash/iggy/IggySwf.java | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFile.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFile.java index 30b7791f2..3e151a226 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFile.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFile.java @@ -620,23 +620,23 @@ public class IggyFile implements StructureInterface { } public long getSwfXMin(int swfIndex) { - return headers.get(swfIndex).getXMin(); + return iggySwfs.get(swfIndex).getHdr().getXMin(); } public long getSwfYMin(int swfIndex) { - return headers.get(swfIndex).getYMin(); + return iggySwfs.get(swfIndex).getHdr().getYMin(); } public long getSwfXMax(int swfIndex) { - return headers.get(swfIndex).getXMax(); + return iggySwfs.get(swfIndex).getHdr().getXMax(); } public long getSwfYMax(int swfIndex) { - return headers.get(swfIndex).getYMax(); + return iggySwfs.get(swfIndex).getHdr().getYMax(); } public float getSwfFrameRate(int swfIndex) { - return headers.get(swfIndex).getFrameRate(); + return iggySwfs.get(swfIndex).getHdr().getFrameRate(); } //WIP diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggySwf.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggySwf.java index 0eed741c1..8d9739e14 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggySwf.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggySwf.java @@ -41,6 +41,10 @@ public class IggySwf implements StructureInterface { private List font_add_off = new ArrayList<>(); private List font_add_size = new ArrayList<>(); + public IggyFlashHeader64 getHdr() { + return hdr; + } + public void replaceFontTag(int fontIndex, IggyFont newFont) throws IOException { long newLen; byte newData[];