From 87744890490ea6dc8bf86cac8eb82ab12f10d033 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Mon, 27 Jul 2015 12:12:37 +0200 Subject: [PATCH] ByteArraRange instead of reading them to new byte array: Font4Tag data --- .../src/com/jpexs/decompiler/flash/SWFInputStream.java | 1 + .../src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java index 80b5f7b5a..7beba77dd 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -736,6 +736,7 @@ public class SWFInputStream implements AutoCloseable { return BYTE_ARRAY_EMPTY; } + System.out.println("READ BYTE ARRAY: " + count + " " + name); newDumpLevel(name, "bytes"); byte[] ret = readBytesInternalEx(count); endDumpLevel(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java index 4c91576f2..f320373a6 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java @@ -51,7 +51,7 @@ public class DefineFont4Tag extends CharacterTag { public String fontName; - public byte[] fontData; + public ByteArrayRange fontData; /** * Constructor @@ -62,7 +62,7 @@ public class DefineFont4Tag extends CharacterTag { super(swf, ID, NAME, null); fontID = swf.getNextCharacterId(); fontName = "New font"; - fontData = SWFInputStream.BYTE_ARRAY_EMPTY; + fontData = ByteArrayRange.EMPTY; } public DefineFont4Tag(SWFInputStream sis, ByteArrayRange data) throws IOException { @@ -78,7 +78,7 @@ public class DefineFont4Tag extends CharacterTag { fontFlagsItalic = sis.readUB(1, "fontFlagsItalic") == 1; fontFlagsBold = sis.readUB(1, "fontFlagsBold") == 1; fontName = sis.readString("fontName"); - fontData = sis.readBytesEx(sis.available(), "fontData"); + fontData = sis.readByteRangeEx(sis.available(), "fontData"); } /**