From 14cabef4d6a46373a5eeeaaf32b1bc69434e0aa5 Mon Sep 17 00:00:00 2001 From: honfika Date: Sat, 16 Aug 2014 17:37:30 +0200 Subject: [PATCH] Issue #640: 2nd text import bug fixed --- src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java | 6 +++++- src/com/jpexs/decompiler/flash/tags/DefineTextTag.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java index 1e957cca1..8457b1abc 100644 --- a/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java +++ b/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java @@ -328,6 +328,11 @@ public class DefineText2Tag extends TextTag { } break; case TEXT: + String txt = (texts == null || textIdx >= texts.length) ? (String) s.values[0] : texts[textIdx++]; + if (txt == null || (font == null && txt.isEmpty())) { + continue; + } + if (font == null) { throw new ParseException("Font not defined", lexer.yyline()); } @@ -354,7 +359,6 @@ public class DefineText2Tag extends TextTag { tr.styleFlagsHasYOffset = true; y = null; } - String txt = (texts == null || textIdx >= texts.length) ? (String) s.values[0] : texts[textIdx++]; tr.glyphEntries = new GLYPHENTRY[txt.length()]; for (int i = 0; i < txt.length(); i++) { char c = txt.charAt(i); diff --git a/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java index d296d27bf..690f96926 100644 --- a/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java +++ b/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java @@ -335,7 +335,7 @@ public class DefineTextTag extends TextTag { break; case TEXT: String txt = (texts == null || textIdx >= texts.length) ? (String) s.values[0] : texts[textIdx++]; - if (txt == null) { + if (txt == null || (font == null && txt.isEmpty())) { continue; }