From 8ab0892d019c2629e38cee8ce4a73647bd9f31cd Mon Sep 17 00:00:00 2001
From: Honfika <honfika@gmail.com>
Date: Sun, 23 Feb 2014 13:44:53 +0100
Subject: [PATCH] Bitmap rendering: text color fixed

---
 .../jpexs/decompiler/flash/exporters/BitmapExporter.java    | 6 +++++-
 .../jpexs/decompiler/flash/exporters/SVGShapeExporter.java  | 4 ++++
 .../jpexs/decompiler/flash/exporters/ShapeExporterBase.java | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/trunk/src/com/jpexs/decompiler/flash/exporters/BitmapExporter.java b/trunk/src/com/jpexs/decompiler/flash/exporters/BitmapExporter.java
index 2fa519cab..f80a5dcf4 100644
--- a/trunk/src/com/jpexs/decompiler/flash/exporters/BitmapExporter.java
+++ b/trunk/src/com/jpexs/decompiler/flash/exporters/BitmapExporter.java
@@ -167,7 +167,11 @@ public class BitmapExporter extends ShapeExporterBase implements IShapeExporter
     @Override
     public void beginFill(RGB color) {
         finalizePath();
-        fillPaint = color.toColor();
+        if (color == null) {
+            fillPaint = defaultColor;
+        } else {
+            fillPaint = color.toColor();
+        }
     }
 
     @Override
diff --git a/trunk/src/com/jpexs/decompiler/flash/exporters/SVGShapeExporter.java b/trunk/src/com/jpexs/decompiler/flash/exporters/SVGShapeExporter.java
index 0e0afd206..99e786526 100644
--- a/trunk/src/com/jpexs/decompiler/flash/exporters/SVGShapeExporter.java
+++ b/trunk/src/com/jpexs/decompiler/flash/exporters/SVGShapeExporter.java
@@ -28,6 +28,7 @@ import com.jpexs.decompiler.flash.types.RGBA;
 import com.jpexs.decompiler.flash.types.SHAPE;
 import com.jpexs.helpers.Helper;
 import com.jpexs.helpers.SerializableImage;
+import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -125,6 +126,9 @@ public class SVGShapeExporter extends DefaultSVGShapeExporter {
 
     @Override
     public void beginFill(RGB color) {
+        if (color == null) {
+            color = new RGB(Color.BLACK);
+        }
         finalizePath();
         path.setAttribute("stroke", "none");
         path.setAttribute("fill", color.toHexRGB());
diff --git a/trunk/src/com/jpexs/decompiler/flash/exporters/ShapeExporterBase.java b/trunk/src/com/jpexs/decompiler/flash/exporters/ShapeExporterBase.java
index ed01d0b4f..d02142527 100644
--- a/trunk/src/com/jpexs/decompiler/flash/exporters/ShapeExporterBase.java
+++ b/trunk/src/com/jpexs/decompiler/flash/exporters/ShapeExporterBase.java
@@ -302,8 +302,8 @@ public abstract class ShapeExporterBase implements IShapeExporter {
                         }
                     } catch (Exception ex) {
                         // Font shapes define no fillstyles per se, but do reference fillstyle index 1,
-                        // which represents the font color. We just report solid black in this case.
-                        beginFill(new RGB(Color.BLACK));
+                        // which represents the font color. We just report null in this case.
+                        beginFill(null);
                     }
                 }
                 if (!pos.equals(e.getFrom())) {