From 38aa38eaeee50118e60360ba03b15bc121f3015e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Sat, 19 Jan 2013 17:50:01 +0100 Subject: [PATCH] Issue 27: DefineSceneAndFrameLabel tag --- trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java | 5 ++++- .../jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java index 7b2e7dd69..cd348f799 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java @@ -18,6 +18,7 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.Main; import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.abc.CopyOutputStream; @@ -129,7 +130,9 @@ public class DefineFont3Tag extends CharacterTag implements FontTag { ByteArrayOutputStream baos = new ByteArrayOutputStream(); OutputStream os = baos; SWFOutputStream sos = new SWFOutputStream(os, version); - sos = new SWFOutputStream(new CopyOutputStream(sos, new ByteArrayInputStream(data)), 10); + if(Main.DEBUG_COPY){ + sos = new SWFOutputStream(new CopyOutputStream(sos, new ByteArrayInputStream(data)), 10); + } try { sos.writeUI16(fontId); sos.writeUB(1, fontFlagsHasLayout ? 1 : 0); diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java b/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java index 363425c3e..dd293322f 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java @@ -84,6 +84,8 @@ public class DefineSceneAndFrameLabelDataTag extends Tag { sceneNames[i] = sis.readString(); } int frameLabelCount = (int) sis.readEncodedU32(); + frameNums=new long[frameLabelCount]; + frameNames=new String[frameLabelCount]; for (int i = 0; i < frameLabelCount; i++) { frameNums[i] = sis.readEncodedU32(); frameNames[i] = sis.readString();