From 149dba53fa308278befca700953ed9a45a2aae7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Thu, 8 Dec 2022 23:04:52 +0100
Subject: [PATCH] Added Option to fix conflation artifacts in antialising
 (Default off - it is slow)

---
 CHANGELOG.md                                  |  1 +
 .../flash/configuration/Configuration.java    |  4 ++
 .../flash/exporters/shape/BitmapExporter.java | 35 ++++++++--
 .../exporters/shape/CanvasShapeExporter.java  |  8 +++
 .../shape/DefaultSVGShapeExporter.java        | 22 +++++++
 .../flash/exporters/shape/IShapeExporter.java |  4 +-
 .../flash/exporters/shape/PathExporter.java   |  9 ++-
 .../exporters/shape/SVGShapeExporter.java     | 13 +++-
 .../exporters/shape/ShapeExportData.java      |  2 +
 .../exporters/shape/ShapeExporterBase.java    | 64 ++++++++++++++++---
 .../locales/AdvancedSettingsDialog.properties |  4 ++
 .../AdvancedSettingsDialog_cs.properties      |  5 +-
 12 files changed, 151 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6588bfc72..f46cdd059 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 - List of treenode subitems on otherwise empty panel (with 32x32 icons)
 - DefineVideoStream codecId and videoFlagsDeblocking handled as enums in raw editation
 - Option to mute frame sounds
+- Option to fix conflation artifacts in antialising (Default off - it is slow)
 
 ### Fixed
 - [#1897] Close menu button without selecting specific item
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index 87770cb7d..f2a4224fb 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -827,6 +827,10 @@ public final class Configuration {
     @ConfigurationCategory("display")
     public static ConfigurationItem<Boolean> playFrameSounds = null;
     
+    @ConfigurationDefaultBoolean(false)
+    @ConfigurationCategory("display")
+    public static ConfigurationItem<Boolean> fixAntialiasConflation = null;
+    
     private enum OSId {
         WINDOWS, OSX, UNIX
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java
index 4c4c13b1a..679677b95 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java
@@ -45,6 +45,7 @@ import java.awt.Shape;
 import java.awt.Stroke;
 import java.awt.TexturePaint;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.image.BufferedImage;
@@ -74,6 +75,8 @@ public class BitmapExporter extends ShapeExporterBase {
     private final SWF swf;
 
     private final GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD);  //For correct intersections display;
+    
+    private Shape aliasedShape;
 
     private Paint fillPaint;
 
@@ -104,6 +107,13 @@ public class BitmapExporter extends ShapeExporterBase {
     private static boolean linearGradientColorWarnignShown = false;
 
     private boolean scaleStrokes;
+    
+    private boolean aliasedFill = false;
+
+    @Override
+    public void beginAliasedFills() {
+        aliasedFill = true;
+    }
 
     private class TransformedStroke implements Stroke {
 
@@ -211,6 +221,7 @@ public class BitmapExporter extends ShapeExporterBase {
 
     @Override
     public void beginFills() {
+        aliasedFill = false;
     }
 
     @Override
@@ -597,12 +608,21 @@ public class BitmapExporter extends ShapeExporterBase {
     }
 
     protected void finalizePath() {
-        if (fillPaint != null) {
+        if (fillPaint != null) {           
+            Shape shp = path;
+            if (aliasedFill) {
+                aliasedShape = new BasicStroke((float)(SWF.unitDivisor / unzoom / 2), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND).createStrokedShape(shp);
+                return;
+            } else if (aliasedShape != null) {
+                Area a = new Area(shp);
+                a.add(new Area(aliasedShape));
+                shp = a;
+            }
             graphics.setComposite(AlphaComposite.SrcOver);
             if (fillPaint instanceof MultipleGradientPaint) {
                 AffineTransform oldAf = graphics.getTransform();
                 Shape prevClip = graphics.getClip();
-                graphics.clip(path);
+                graphics.clip(shp);
                 Matrix inverse = null;
                 try {
                     double scx = fillTransform.getScaleX();
@@ -627,7 +647,7 @@ public class BitmapExporter extends ShapeExporterBase {
                 graphics.setPaint(fillPaint);
 
                 if (inverse != null) {
-                    ExportRectangle rect = inverse.transform(new ExportRectangle(path.getBounds2D()));
+                    ExportRectangle rect = inverse.transform(new ExportRectangle(shp.getBounds2D()));
                     double minX = rect.xMin;
                     double minY = rect.yMin;
                     graphics.fill(new java.awt.Rectangle((int) minX, (int) minY, (int) (rect.xMax - minX), (int) (rect.yMax - minY)));
@@ -638,7 +658,7 @@ public class BitmapExporter extends ShapeExporterBase {
             } else if (fillPaint instanceof TexturePaint) {
                 AffineTransform oldAf = graphics.getTransform();
                 Shape prevClip = graphics.getClip();
-                graphics.clip(path);
+                graphics.clip(shp);
                 Matrix inverse = null;
                 if (fillRepeat) {
                     try {
@@ -671,7 +691,7 @@ public class BitmapExporter extends ShapeExporterBase {
                 if (fillRepeat) {
                     if (inverse != null) {
 
-                        ExportRectangle rect = inverse.transform(new ExportRectangle(path.getBounds2D()));
+                        ExportRectangle rect = inverse.transform(new ExportRectangle(shp.getBounds2D()));
                         double minX = rect.xMin;
                         double minY = rect.yMin;
                         graphics.fill(new Rectangle((int) minX, (int) minY, (int) (rect.xMax - minX), (int) (rect.yMax - minY)));
@@ -685,10 +705,13 @@ public class BitmapExporter extends ShapeExporterBase {
                 graphics.setClip(prevClip);
             } else {
                 graphics.setPaint(fillPaint);
-                graphics.fill(path);
+                graphics.fill(shp);
             }
         }
         if (linePaint != null && lineStroke != null) {
+            if(true) {
+                //return;
+            }
             Shape strokedShape = lineStroke.createStrokedShape(path);
             graphics.setComposite(AlphaComposite.SrcOver);
             if (linePaint instanceof MultipleGradientPaint) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java
index 3481fdc6e..e733cfda7 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java
@@ -81,6 +81,8 @@ public class CanvasShapeExporter extends ShapeExporterBase {
     protected int fillWidth = 0;
 
     protected int fillHeight = 0;
+    
+    protected boolean aliasedFill = false;
 
     public static String getJsPrefix() {
         return "<script>var canvas=document.getElementById(\"myCanvas\");\r\n"
@@ -168,6 +170,7 @@ public class CanvasShapeExporter extends ShapeExporterBase {
 
     @Override
     public void beginFills() {
+        aliasedFill = false;
     }
 
     @Override
@@ -521,4 +524,9 @@ public class CanvasShapeExporter extends ShapeExporterBase {
         fillWidth = 0;
         fillHeight = 0;
     }
+
+    @Override
+    public void beginAliasedFills() {
+        aliasedFill = true;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/DefaultSVGShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/DefaultSVGShapeExporter.java
index 23b0500fb..99865f3c2 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/DefaultSVGShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/DefaultSVGShapeExporter.java
@@ -38,6 +38,8 @@ public abstract class DefaultSVGShapeExporter extends ShapeExporterBase {
     protected StringBuilder pathData;
 
     protected double zoom;
+    
+    protected boolean aliasedFill;
 
     public DefaultSVGShapeExporter(int shapeNum, SWF swf, SHAPE shape, ColorTransform colorTransform, double zoom) {
         super(shapeNum, swf, shape, colorTransform);
@@ -54,6 +56,7 @@ public abstract class DefaultSVGShapeExporter extends ShapeExporterBase {
 
     @Override
     public void beginFills() {
+        aliasedFill = false;
     }
 
     @Override
@@ -75,21 +78,33 @@ public abstract class DefaultSVGShapeExporter extends ShapeExporterBase {
 
     @Override
     public void beginFill(RGB color) {
+        if (aliasedFill) {
+            return;
+        }
         finalizePath();
     }
 
     @Override
     public void beginGradientFill(int type, GRADRECORD[] gradientRecords, Matrix matrix, int spreadMethod, int interpolationMethod, float focalPointRatio) {
+        if (aliasedFill) {
+            return;
+        }
         finalizePath();
     }
 
     @Override
     public void beginBitmapFill(int bitmapId, Matrix matrix, boolean repeat, boolean smooth, ColorTransform colorTransform) {
+        if (aliasedFill) {
+            return;
+        }
         finalizePath();
     }
 
     @Override
     public void endFill() {
+        if (aliasedFill) {
+            return;
+        }
         finalizePath();
     }
 
@@ -142,4 +157,11 @@ public abstract class DefaultSVGShapeExporter extends ShapeExporterBase {
     protected double roundPixels20(double pixels) {
         return Math.round(pixels * 100) / 100.0;
     }
+
+    @Override
+    public void beginAliasedFills() {
+        aliasedFill = true;
+    }
+    
+    
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/IShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/IShapeExporter.java
index d45d552f1..8570f390a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/IShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/IShapeExporter.java
@@ -30,7 +30,9 @@ public interface IShapeExporter {
     public void beginShape();
 
     public void endShape();
-
+    
+    public void beginAliasedFills();
+    
     public void beginFills();
 
     public void endFills();
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java
index fa91b0ef8..331a14a92 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java
@@ -38,6 +38,8 @@ public class PathExporter extends ShapeExporterBase {
     private final List<GeneralPath> strokes = new ArrayList<>();
 
     private double thickness = 0;
+    
+    private boolean aliasedFill = false;
 
     private GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
 
@@ -73,7 +75,7 @@ public class PathExporter extends ShapeExporterBase {
 
     @Override
     public void beginFills() {
-
+        aliasedFill = false;
     }
 
     @Override
@@ -151,4 +153,9 @@ public class PathExporter extends ShapeExporterBase {
         paths.add(path);
         path = new GeneralPath(GeneralPath.WIND_EVEN_ODD);  //For correct intersections display
     }
+
+    @Override
+    public void beginAliasedFills() {
+        aliasedFill = true;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
index 36cc27e34..65f6b4ce0 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/SVGShapeExporter.java
@@ -50,7 +50,7 @@ public class SVGShapeExporter extends DefaultSVGShapeExporter {
 
     private final SWF swf;
 
-    private final SVGExporter exporter;
+    private final SVGExporter exporter;    
 
     public SVGShapeExporter(int shapeNum, SWF swf, SHAPE shape, int id, SVGExporter exporter, Color defaultColor, ColorTransform colorTransform, double zoom) {
         super(shapeNum, swf, shape, colorTransform, zoom);
@@ -58,10 +58,13 @@ public class SVGShapeExporter extends DefaultSVGShapeExporter {
         this.id = id;
         this.defaultColor = defaultColor;
         this.exporter = exporter;
-    }
+    }       
 
     @Override
     public void beginFill(RGB color) {
+        if (aliasedFill) {
+            return;
+        }
         if (color == null && defaultColor != null) {
             color = new RGB(defaultColor);
         }
@@ -81,6 +84,9 @@ public class SVGShapeExporter extends DefaultSVGShapeExporter {
 
     @Override
     public void beginGradientFill(int type, GRADRECORD[] gradientRecords, Matrix matrix, int spreadMethod, int interpolationMethod, float focalPointRatio) {
+        if (aliasedFill) {
+            return;
+        }
         finalizePath();
         Element gradient = (type == FILLSTYLE.LINEAR_GRADIENT)
                 ? exporter.createElement("linearGradient")
@@ -141,6 +147,9 @@ public class SVGShapeExporter extends DefaultSVGShapeExporter {
 
     @Override
     public void beginBitmapFill(int bitmapId, Matrix matrix, boolean repeat, boolean smooth, ColorTransform colorTransform) {
+        if (aliasedFill) {
+            return;
+        }
         finalizePath();
         String patternId = getPattern(bitmapId, matrix, colorTransform);
         if (patternId != null) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExportData.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExportData.java
index 3e55e013d..62bb8bc47 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExportData.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExportData.java
@@ -32,5 +32,7 @@ public class ShapeExportData {
 
     public List<List<IEdge>> fillPaths;
 
+    public List<List<IEdge>> aliasedFillPaths;
+    
     public List<List<IEdge>> linePaths;
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExporterBase.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExporterBase.java
index 98b8009fd..b7d199e1d 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExporterBase.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExporterBase.java
@@ -17,6 +17,7 @@
 package com.jpexs.decompiler.flash.exporters.shape;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.commonshape.FillStyle;
 import com.jpexs.decompiler.flash.exporters.commonshape.LineStyle;
 import com.jpexs.decompiler.flash.types.ColorTransform;
@@ -39,6 +40,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import sun.jvm.hotspot.interpreter.Bytecodes;
 
 /**
  *
@@ -55,6 +57,8 @@ public abstract class ShapeExporterBase implements IShapeExporter {
     private final List<LineStyle> _lineStyles;
 
     private final List<List<IEdge>> _fillPaths;
+    
+    private final List<List<IEdge>> _aliasedFillPaths;
 
     private final List<List<IEdge>> _linePaths;
 
@@ -88,22 +92,26 @@ public abstract class ShapeExporterBase implements IShapeExporter {
 
             // Create edge maps
             List<Map<Integer, List<IEdge>>> fillEdgeMaps = new ArrayList<>();
+            List<Map<Integer, List<IEdge>>> aliasedFillEdgeMaps = new ArrayList<>();
             List<Map<Integer, List<IEdge>>> lineEdgeMaps = new ArrayList<>();
             try {
-                createEdgeMaps(shapeNum, shape, fillStyles, lineStyles, fillEdgeMaps, lineEdgeMaps);
+                createEdgeMaps(shapeNum, shape, fillStyles, lineStyles, fillEdgeMaps, aliasedFillEdgeMaps, lineEdgeMaps);
             } catch (Throwable t) {
                 t.printStackTrace();
             }
             int count = lineEdgeMaps.size();
             List<List<IEdge>> fillPaths = new ArrayList<>(count);
+            List<List<IEdge>> aliasedFillPaths = new ArrayList<>(count);
             List<List<IEdge>> linePaths = new ArrayList<>(count);
             for (int i = 0; i < count; i++) {
                 fillPaths.add(createPathFromEdgeMap(fillEdgeMaps.get(i)));
+                aliasedFillPaths.add(createPathFromEdgeMap(aliasedFillEdgeMaps.get(i)));
                 linePaths.add(createPathFromEdgeMap(lineEdgeMaps.get(i)));
             }
 
             cachedData = new ShapeExportData();
             cachedData.fillPaths = fillPaths;
+            cachedData.aliasedFillPaths = aliasedFillPaths;
             cachedData.linePaths = linePaths;
             cachedData.fillStyles = fillStyles;
             cachedData.lineStyles = lineStyles;
@@ -113,6 +121,7 @@ public abstract class ShapeExporterBase implements IShapeExporter {
         _fillStyles = cachedData.fillStyles;
         _lineStyles = cachedData.lineStyles;
         _fillPaths = cachedData.fillPaths;
+        _aliasedFillPaths = cachedData.aliasedFillPaths;
         _linePaths = cachedData.linePaths;
     }
 
@@ -121,8 +130,12 @@ public abstract class ShapeExporterBase implements IShapeExporter {
         beginShape();
         // Export fills and strokes for each group separately
         for (int i = 0; i < _linePaths.size(); i++) {
+            
+            if (Configuration.fixAntialiasConflation.get()) {
+                exportFillPath(_aliasedFillPaths.get(i), true);            
+            }
             // Export fills first
-            exportFillPath(_fillPaths.get(i));
+            exportFillPath(_fillPaths.get(i), false);
             // Export strokes last
             exportLinePath(_linePaths.get(i));
         }
@@ -131,7 +144,7 @@ public abstract class ShapeExporterBase implements IShapeExporter {
     }
 
     private void createEdgeMaps(int shapeNum, SHAPE shape, List<FillStyle> fillStyles, List<LineStyle> lineStyles,
-            List<Map<Integer, List<IEdge>>> fillEdgeMaps, List<Map<Integer, List<IEdge>>> lineEdgeMaps) {
+            List<Map<Integer, List<IEdge>>> fillEdgeMaps, List<Map<Integer, List<IEdge>>> aliasedFillEdgeMaps, List<Map<Integer, List<IEdge>>> lineEdgeMaps) {
         int xPos = 0;
         int yPos = 0;
         int fillStyleIdxOffset = 0;
@@ -142,13 +155,14 @@ public abstract class ShapeExporterBase implements IShapeExporter {
         List<IEdge> subPath = new ArrayList<>();
         Map<Integer, List<IEdge>> currentFillEdgeMap = new HashMap<>();
         Map<Integer, List<IEdge>> currentLineEdgeMap = new HashMap<>();
+        Map<Integer, List<IEdge>> currentAliasedFillEdgeMap = new HashMap<>();
         List<SHAPERECORD> records = shape.shapeRecords;
         for (int i = 0; i < records.size(); i++) {
             SHAPERECORD shapeRecord = records.get(i);
             if (shapeRecord instanceof StyleChangeRecord) {
                 StyleChangeRecord styleChangeRecord = (StyleChangeRecord) shapeRecord;
                 if (styleChangeRecord.stateLineStyle || styleChangeRecord.stateFillStyle0 || styleChangeRecord.stateFillStyle1) {
-                    processSubPath(subPath, currentLineStyleIdx, currentFillStyleIdx0, currentFillStyleIdx1, currentFillEdgeMap, currentLineEdgeMap);
+                    processSubPath(subPath, currentLineStyleIdx, currentFillStyleIdx0, currentFillStyleIdx1, currentFillEdgeMap, currentLineEdgeMap, currentAliasedFillEdgeMap);
                     subPath = new ArrayList<>();
                 }
                 if (styleChangeRecord.stateNewStyles) {
@@ -167,10 +181,13 @@ public abstract class ShapeExporterBase implements IShapeExporter {
                         && styleChangeRecord.stateFillStyle0 && styleChangeRecord.fillStyle0 == 0
                         && styleChangeRecord.stateFillStyle1 && styleChangeRecord.fillStyle1 == 0) {
                     cleanEdgeMap(currentFillEdgeMap);
+                    cleanEdgeMap(currentAliasedFillEdgeMap);
                     cleanEdgeMap(currentLineEdgeMap);
                     fillEdgeMaps.add(currentFillEdgeMap);
+                    aliasedFillEdgeMaps.add(currentAliasedFillEdgeMap);
                     lineEdgeMaps.add(currentLineEdgeMap);
                     currentFillEdgeMap = new HashMap<>();
+                    currentAliasedFillEdgeMap = new HashMap<>();
                     currentLineEdgeMap = new HashMap<>();
                     currentLineStyleIdx = 0;
                     currentFillStyleIdx0 = 0;
@@ -223,37 +240,62 @@ public abstract class ShapeExporterBase implements IShapeExporter {
                 subPath.add(new CurvedEdge(xPosFrom, yPosFrom, xPosControl, yPosControl, xPos, yPos, currentLineStyleIdx, currentFillStyleIdx1));
             } else if (shapeRecord instanceof EndShapeRecord) {
                 // We're done. Process the last subpath, if any
-                processSubPath(subPath, currentLineStyleIdx, currentFillStyleIdx0, currentFillStyleIdx1, currentFillEdgeMap, currentLineEdgeMap);
+                processSubPath(subPath, currentLineStyleIdx, currentFillStyleIdx0, currentFillStyleIdx1, currentFillEdgeMap, currentLineEdgeMap, currentAliasedFillEdgeMap);                
                 cleanEdgeMap(currentFillEdgeMap);
-                cleanEdgeMap(currentLineEdgeMap);
+                cleanEdgeMap(currentAliasedFillEdgeMap);                
+                cleanEdgeMap(currentLineEdgeMap);                
                 fillEdgeMaps.add(currentFillEdgeMap);
+                aliasedFillEdgeMaps.add(currentAliasedFillEdgeMap);
                 lineEdgeMaps.add(currentLineEdgeMap);
             }
         }
     }
 
     private void processSubPath(List<IEdge> subPath, int lineStyleIdx, int fillStyleIdx0, int fillStyleIdx1,
-            Map<Integer, List<IEdge>> currentFillEdgeMap, Map<Integer, List<IEdge>> currentLineEdgeMap) {
+            Map<Integer, List<IEdge>> currentFillEdgeMap, Map<Integer, List<IEdge>> currentLineEdgeMap, Map<Integer, List<IEdge>> currentAliasedFillEdgeMap) {
         List<IEdge> path;
+        List<IEdge> apath = null;
+        boolean bothFillStyles = fillStyleIdx0 !=0 && fillStyleIdx1 != 0;
         if (fillStyleIdx0 != 0) {
             path = currentFillEdgeMap.get(fillStyleIdx0);
+            if (bothFillStyles) {
+                apath = currentAliasedFillEdgeMap.get(fillStyleIdx0);
+            }
             if (path == null) {
                 path = new ArrayList<>();
                 currentFillEdgeMap.put(fillStyleIdx0, path);
             }
+            if (bothFillStyles && apath == null) {
+                apath = new ArrayList<>();
+                currentAliasedFillEdgeMap.put(fillStyleIdx0, apath);                        
+            }
             for (int j = subPath.size() - 1; j >= 0; j--) {
                 IEdge rev = subPath.get(j).reverseWithNewFillStyle(fillStyleIdx0);
                 //System.err.println("appending reversed " + rev);
                 path.add(rev);
+                if (bothFillStyles) {
+                    apath.add(rev);
+                }
             }
+            
         }
         if (fillStyleIdx1 != 0) {
+            /*if (bothFillStyles) {
+                apath = currentAliasedFillEdgeMap.get(fillStyleIdx1);
+            }*/
             path = currentFillEdgeMap.get(fillStyleIdx1);
             if (path == null) {
                 path = new ArrayList<>();
                 currentFillEdgeMap.put(fillStyleIdx1, path);
             }
+            /*if (bothFillStyles && apath == null) {
+                apath = new ArrayList<>();
+                currentAliasedFillEdgeMap.put(fillStyleIdx1, apath);                        
+            }*/
             appendEdges(path, subPath);
+            /*if (bothFillStyles) {
+                appendEdges(apath, subPath);
+            }*/
         }
         if (lineStyleIdx != 0) {
             path = currentLineEdgeMap.get(lineStyleIdx);
@@ -265,12 +307,16 @@ public abstract class ShapeExporterBase implements IShapeExporter {
         }
     }
 
-    private void exportFillPath(List<IEdge> path) {
+    private void exportFillPath(List<IEdge> path, boolean aliased) {
         int posX = Integer.MAX_VALUE;
         int posY = Integer.MAX_VALUE;
         int fillStyleIdx = Integer.MAX_VALUE;
         if (path.size() > 0) {
-            beginFills();
+            if (aliased) {
+                beginAliasedFills();
+            } else {
+                beginFills();
+            }
             for (int i = 0; i < path.size(); i++) {
                 IEdge e = path.get(i);
                 if (fillStyleIdx != e.getFillStyleIdx()) {
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
index 4c3e4fd74..6d3a6469a 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
@@ -629,3 +629,7 @@ config.description.warning.video.vlc = Show warning about VLC media player requi
 
 config.name.playFrameSounds = Play frame sounds
 config.description.playFrameSounds = Play sounds on displaying frames.
+
+config.name.fixAntialiasConflation = Try to fix antialias conflation (SLOW)
+config.description.fixAntialiasConflation = Tries fixing conflation artifacts between adjacent shapes caused by antialiasing. This slows down a rendering.
+
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
index eca1ddf3a..1854cb5b9 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
@@ -618,4 +618,7 @@ config.name.warning.video.vlc = Varovat p\u0159i chyb\u011bj\u00edc\u00edm VLC
 config.description.warning.video.vlc = Zobrazovat varov\u00e1n\u00ed o vy\u017eadovan\u00e9m VLC media playeru p\u0159i otev\u00edr\u00e1n\u00ed SWF s DefineVideoStream tagy kdy\u017e je VLC nedostupn\u00fd.
 
 config.name.playFrameSounds = P\u0159ehr\u00e1vat sn\u00edmkov\u00e9 zvuky
-config.description.playFrameSounds = P\u0159ehr\u00e1vat zvuky p\u0159i zobrazov\u00e1n\u00ed sn\u00edmk\u016f.
\ No newline at end of file
+config.description.playFrameSounds = P\u0159ehr\u00e1vat zvuky p\u0159i zobrazov\u00e1n\u00ed sn\u00edmk\u016f.
+
+config.name.fixAntialiasConflation = Pokusit se opravit antialiasingovou konflaci (POMAL\u00c9)
+config.description.fixAntialiasConflation = Pokus\u00ed se opravit konfla\u010dn\u00ed artefakty mezi p\u0159il\u00e9haj\u00edc\u00edmi tvary zp\u016fsobenou antialiasingem. Toto zpomaluje renderov\u00e1n\u00ed.