From 7046628b41fe2dab01a4eaa3083ea3bf102a41b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Fri, 25 Nov 2016 17:05:18 +0100
Subject: [PATCH] layout... WIP

---
 .../decompiler/flash/iggy/IggyCharOffset.java | 29 +++++++++++++++++++
 .../jpexs/decompiler/flash/iggy/IggyFont.java |  4 +++
 .../iggy/conversion/IggyToSwfConvertor.java   | 10 +++----
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyCharOffset.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyCharOffset.java
index 4d1ee5783..7c201a42a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyCharOffset.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyCharOffset.java
@@ -67,4 +67,33 @@ public class IggyCharOffset implements StructureInterface {
     public void writeToDataStream(AbstractDataStream stream) throws IOException {
         throw new UnsupportedOperationException("Not supported yet.");
     }
+
+    public long getZero() {
+        return zero;
+    }
+
+    public int getIschar1() {
+        return ischar1;
+    }
+
+    public int getIschar2() {
+        return ischar2;
+    }
+
+    public long getZero2() {
+        return zero2;
+    }
+
+    public int getXscale() {
+        return xscale;
+    }
+
+    public int getYscale() {
+        return yscale;
+    }
+
+    public long getZero3() {
+        return zero3;
+    }
+
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFont.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFont.java
index 2e9eb4fc6..c19776776 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFont.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/IggyFont.java
@@ -314,4 +314,8 @@ public class IggyFont implements StructureInterface {
         return what_3;
     }
 
+    public List<IggyCharOffset> getCharOffsets() {
+        return charOffsets;
+    }
+
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/conversion/IggyToSwfConvertor.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/conversion/IggyToSwfConvertor.java
index 6017db9c8..c959fd997 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/conversion/IggyToSwfConvertor.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/conversion/IggyToSwfConvertor.java
@@ -112,15 +112,15 @@ public class IggyToSwfConvertor {
             System.out.println("what_2: " + iggyFont.getWhat_2());
             System.out.println("what_3: " + iggyFont.getWhat_3());
 
-            /*List<IggyCharOffset> offsets = iggyFont.getc();
+            fontTag.fontFlagsHasLayout = true;
+            List<IggyCharOffset> offsets = iggyFont.getCharOffsets();
             fontTag.fontAdvanceTable = new ArrayList<>();
             for (int i = 0; i < offsets.size(); i++) {
-                fontTag.fontAdvanceTable.add((int) offsets.get(i).getOffset());
-            }*/
-            //FIXME
+                fontTag.fontAdvanceTable.add((int) offsets.get(i).getXscale());
+            }
+            fontTag.fontKerningTable = new ArrayList<>();
             IggyCharKerning ker = iggyFont.getCharKernings();
             if (ker != null) {
-                fontTag.fontKerningTable = new ArrayList<>();
                 for (int i = 0; i < ker.getKernCount(); i++) {
                     int kerningCode1 = ker.getCharsA().get(i);
                     int kerningCode2 = ker.getCharsA().get(i);