From 87b9620405f4103ffbd2138e3e9321395eabe66c Mon Sep 17 00:00:00 2001
From: "honfika@gmail.com" <honfika@gmail.com>
Date: Sun, 7 Dec 2014 22:09:33 +0100
Subject: [PATCH] build fixed on linux (Pull request #12) again:), other small
 fixes

---
 libsrc/ffdec_lib/build_common.xml             |  6 ++-
 .../src/com/jpexs/decompiler/flash/SWF.java   | 42 +++++++++----------
 .../decompiler/flash/xfl/XFLConverter.java    |  8 ++--
 .../decompiler/flash/gui/ImagePanel.java      |  1 -
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/libsrc/ffdec_lib/build_common.xml b/libsrc/ffdec_lib/build_common.xml
index 38fa7e4a8..15c75e246 100644
--- a/libsrc/ffdec_lib/build_common.xml
+++ b/libsrc/ffdec_lib/build_common.xml
@@ -241,7 +241,11 @@
         </pathconvert>
         <script language="javascript"><![CDATA[
         var classpath = project.getProperty("lexers");
-        var parts = classpath.split(/\|/);
+        // + '' converts from a Java string to a JavaScript string, in order
+        // to have .split() behave predictably on all installations.
+        // Otherwise, some versions of ANT will treat it's argument as a regex
+        // while others will not.
+        var parts = (classpath + '').split('|');
         for each (var part in parts) {
             project.setProperty("lexer",project.getProperty("LEXERSDIR")+part);
             self.project.executeTarget("-lexer");
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index af33def5b..8d4fa2951 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -276,6 +276,9 @@ public final class SWF implements SWFContainerItem, Timelined {
     public DumpInfoSwfNode dumpInfo;
     public DefineBinaryDataTag binaryData;
 
+    private final HashMap<String, String> deobfuscated = new HashMap<>();
+    private final IdentifiersDeobfuscation deobfuscation = new IdentifiersDeobfuscation();
+
     private static Cache<String, SerializableImage> frameCache = Cache.getInstance(false, "frame");
     private final Cache<ASMSource, CachedScript> as2Cache = Cache.getInstance(true, "as2");
     private final Cache<ScriptPack, CachedDecompilation> as3Cache = Cache.getInstance(true, "as3");
@@ -1608,13 +1611,6 @@ public final class SWF implements SWFContainerItem, Timelined {
         new BinaryDataExporter().exportBinaryData(handler, outdir, tags, settings);
     }
 
-    private final HashMap<String, String> deobfuscated = new HashMap<>();
-    private List<MyEntry<DirectValueActionItem, ConstantPool>> allVariableNames = new ArrayList<>();
-    private List<GraphSourceItem> allFunctions = new ArrayList<>();
-    private HashMap<DirectValueActionItem, ConstantPool> allStrings = new HashMap<>();
-    private final HashMap<DirectValueActionItem, String> usageTypes = new HashMap<>();
-    private final IdentifiersDeobfuscation deobfuscation = new IdentifiersDeobfuscation();
-
     private static void getVariables(ConstantPool constantPool, BaseLocalData localData, TranslateStack stack, List<GraphTargetItem> output, ActionGraphSource code, int ip, List<MyEntry<DirectValueActionItem, ConstantPool>> variables, List<GraphSourceItem> functions, HashMap<DirectValueActionItem, ConstantPool> strings, List<Integer> visited, HashMap<DirectValueActionItem, String> usageTypes, String path) throws InterruptedException {
         boolean debugMode = false;
         while ((ip > -1) && ip < code.size()) {
@@ -1778,40 +1774,39 @@ public final class SWF implements SWFContainerItem, Timelined {
         };
     }
 
-    private static void getVariables(List<MyEntry<DirectValueActionItem, ConstantPool>> variables, List<GraphSourceItem> functions, HashMap<DirectValueActionItem, ConstantPool> strings, HashMap<DirectValueActionItem, String> usageType, ActionGraphSource code, int addr, String path) throws InterruptedException {
+    private static void getVariables(List<MyEntry<DirectValueActionItem, ConstantPool>> variables, List<GraphSourceItem> functions, HashMap<DirectValueActionItem, ConstantPool> strings, HashMap<DirectValueActionItem, String> usageTypes, ActionGraphSource code, int addr, String path) throws InterruptedException {
         ActionLocalData localData = new ActionLocalData();
-        getVariables(null, localData, new TranslateStack(), new ArrayList<GraphTargetItem>(), code, code.adr2pos(addr), variables, functions, strings, new ArrayList<Integer>(), usageType, path);
+        getVariables(null, localData, new TranslateStack(), new ArrayList<GraphTargetItem>(), code, code.adr2pos(addr), variables, functions, strings, new ArrayList<Integer>(), usageTypes, path);
     }
 
-    private List<MyEntry<DirectValueActionItem, ConstantPool>> getVariables(List<MyEntry<DirectValueActionItem, ConstantPool>> variables, List<GraphSourceItem> functions, HashMap<DirectValueActionItem, ConstantPool> strings, HashMap<DirectValueActionItem, String> usageType, ASMSource src, String path) throws InterruptedException {
+    private List<MyEntry<DirectValueActionItem, ConstantPool>> getVariables(List<MyEntry<DirectValueActionItem, ConstantPool>> variables, HashMap<ASMSource, ActionList> actionsMap, List<GraphSourceItem> functions, HashMap<DirectValueActionItem, ConstantPool> strings, HashMap<DirectValueActionItem, String> usageTypes, ASMSource src, String path) throws InterruptedException {
         List<MyEntry<DirectValueActionItem, ConstantPool>> ret = new ArrayList<>();
         ActionList actions = src.getActions();
         actionsMap.put(src, actions);
-        getVariables(variables, functions, strings, usageType, new ActionGraphSource(actions, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, path);
+        getVariables(variables, functions, strings, usageTypes, new ActionGraphSource(actions, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, path);
         return ret;
     }
-    private HashMap<ASMSource, ActionList> actionsMap = new HashMap<>();
 
-    private void getVariables(List<Tag> tags, String path) throws InterruptedException {
+    private void getVariables(List<Tag> tags, String path, List<MyEntry<DirectValueActionItem, ConstantPool>> variables, HashMap<ASMSource, ActionList> actionsMap, List<GraphSourceItem> functions, HashMap<DirectValueActionItem, ConstantPool> strings, HashMap<DirectValueActionItem, String> usageTypes) throws InterruptedException {
         List<String> processed = new ArrayList<>();
         for (Tag t : tags) {
             String subPath = path + "/" + t.toString();
             if (t instanceof ASMSource) {
-                addVariable((ASMSource) t, subPath, processed);
+                addVariable((ASMSource) t, subPath, processed, variables, actionsMap, functions, strings, usageTypes);
             }
             if (t instanceof ASMSourceContainer) {
                 List<String> processed2 = new ArrayList<>();
                 for (ASMSource asm : ((ASMSourceContainer) t).getSubItems()) {
-                    addVariable(asm, subPath + "/" + asm.toString(), processed2);
+                    addVariable(asm, subPath + "/" + asm.toString(), processed2, variables, actionsMap, functions, strings, usageTypes);
                 }
             }
             if (t instanceof DefineSpriteTag) {
-                getVariables(((DefineSpriteTag) t).getSubTags(), path + "/" + t.toString());
+                getVariables(((DefineSpriteTag) t).getSubTags(), path + "/" + t.toString(), variables, actionsMap, functions, strings, usageTypes);
             }
         }
     }
 
-    private void addVariable(ASMSource asm, String path, List<String> processed) throws InterruptedException {
+    private void addVariable(ASMSource asm, String path, List<String> processed, List<MyEntry<DirectValueActionItem, ConstantPool>> variables, HashMap<ASMSource, ActionList> actionsMap, List<GraphSourceItem> functions, HashMap<DirectValueActionItem, ConstantPool> strings, HashMap<DirectValueActionItem, String> usageTypes) throws InterruptedException {
         int pos = 1;
         String infPath2 = path;
         while (processed.contains(infPath2)) {
@@ -1820,7 +1815,7 @@ public final class SWF implements SWFContainerItem, Timelined {
         }
         processed.add(infPath2);
         informListeners("getVariables", infPath2);
-        getVariables(allVariableNames, allFunctions, allStrings, usageTypes, asm, path);
+        getVariables(variables, actionsMap, functions, strings, usageTypes, asm, path);
     }
 
     public int deobfuscateAS3Identifiers(RenameType renameType) {
@@ -1879,13 +1874,14 @@ public final class SWF implements SWFContainerItem, Timelined {
     }
 
     private int renameAS2Identifiers(RenameType renameType, Map<String, String> selected) throws InterruptedException {
-        actionsMap = new HashMap<>();
-        allFunctions = new ArrayList<>();
-        allVariableNames = new ArrayList<>();
-        allStrings = new HashMap<>();
+        HashMap<ASMSource, ActionList> actionsMap = new HashMap<>();
+        List<GraphSourceItem> allFunctions = new ArrayList<>();
+        List<MyEntry<DirectValueActionItem, ConstantPool>> allVariableNames = new ArrayList<>();
+        HashMap<DirectValueActionItem, ConstantPool> allStrings = new HashMap<>();
+        HashMap<DirectValueActionItem, String> usageTypes = new HashMap<>();
 
         int ret = 0;
-        getVariables(tags, "");
+        getVariables(tags, "", allVariableNames, actionsMap, allFunctions, allStrings, usageTypes);
         informListeners("rename", "");
         int fc = 0;
         for (MyEntry<DirectValueActionItem, ConstantPool> it : allVariableNames) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
index 6009fce7c..3b57e935e 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
@@ -210,7 +210,7 @@ public class XFLConverter {
     }
 
     public static String convertLineStyle(LINESTYLE ls, int shapeNum) {
-        return "<SolidStroke weight=\"" + (((float) ls.width) / 20.0) + "\">"
+        return "<SolidStroke weight=\"" + (((float) ls.width) / SWF.unitDivisor) + "\">"
                 + "<fill>"
                 + "<SolidColor color=\"" + ls.color.toHexRGB() + "\""
                 + (shapeNum == 3 ? " alpha=\"" + ((RGBA) ls.color).getAlphaFloat() + "\"" : "")
@@ -257,7 +257,7 @@ public class XFLConverter {
                 break;
         }
 
-        ret.append("<SolidStroke weight=\"").append(((float) ls.width) / 20.0).append("\"");
+        ret.append("<SolidStroke weight=\"").append(((float) ls.width) / SWF.unitDivisor).append("\"");
         ret.append(params);
         ret.append(">");
         ret.append("<fill>");
@@ -405,8 +405,8 @@ public class XFLConverter {
             m = new Matrix();
         }
         ret.append("<Matrix ");
-        ret.append("tx=\"").append(((float) m.translateX) / 20.0).append("\" ");
-        ret.append("ty=\"").append(((float) m.translateY) / 20.0).append("\" ");
+        ret.append("tx=\"").append(((float) m.translateX) / SWF.unitDivisor).append("\" ");
+        ret.append("ty=\"").append(((float) m.translateY) / SWF.unitDivisor).append("\" ");
         if (m.scaleX != 1.0 || m.scaleY != 1.0) {
             ret.append("a=\"").append(m.scaleX).append("\" ");
             ret.append("d=\"").append(m.scaleY).append("\" ");
diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
index a986f6a78..61ed0d2ea 100644
--- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
@@ -582,7 +582,6 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
                             bounds.height /= 20;
                             bounds.x -= rect.Xmin / 20;
                             bounds.y -= rect.Ymin / 20;
-                            //SHAPERECORD.resizeSHAPE(outline, 1/20)
                             gg.setStroke(new BasicStroke(2.0f,
                                     BasicStroke.CAP_BUTT,
                                     BasicStroke.JOIN_MITER,