From 62bbd86140286c40242eb04509eafe776b03e2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Mon, 17 Nov 2025 21:17:34 +0100 Subject: [PATCH] Removed: [#2541], [#2564] Antialias conflation fixer --- CHANGELOG.md | 5 ++++- .../jpexs/decompiler/flash/configuration/Configuration.java | 3 ++- .../decompiler/flash/exporters/shape/BitmapExporter.java | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ba1211a9..b2c4a1aac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,8 @@ All notable changes to this project will be documented in this file. - Simple editor uses percent as units for filter strength ### Removed -- Removed resampling from CLI and all source code +- Resampling from CLI and all source code +- [#2541], [#2564] Antialias conflation fixer ## [24.1.0] - 2025-09-28 ### Added @@ -4052,6 +4053,8 @@ Major version of SWF to XML export changed to 2. [#2550]: https://www.free-decompiler.com/flash/issues/2550 [#2561]: https://www.free-decompiler.com/flash/issues/2561 [#2562]: https://www.free-decompiler.com/flash/issues/2562 +[#2541]: https://www.free-decompiler.com/flash/issues/2541 +[#2564]: https://www.free-decompiler.com/flash/issues/2564 [#2477]: https://www.free-decompiler.com/flash/issues/2477 [#2478]: https://www.free-decompiler.com/flash/issues/2478 [#2485]: https://www.free-decompiler.com/flash/issues/2485 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 a7ea8ee6e..d1b1167be 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 @@ -840,8 +840,9 @@ public final class Configuration { @ConfigurationDefaultBoolean(false) @ConfigurationCategory("display") + @ConfigurationRemoved public static ConfigurationItem fixAntialiasConflation = null; - + @ConfigurationDefaultBoolean(true) @ConfigurationCategory("display") public static ConfigurationItem autoPlaySounds = null; 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 8480db859..4d41b28bf 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 @@ -415,9 +415,11 @@ public class BitmapExporter extends ShapeExporterBase { thickness = 1 * SWF.unitDivisor / unzoom; } + /* if (Configuration.fixAntialiasConflation.get()) { thickness += 1 * SWF.unitDivisor / unzoom; } + */ if (joinStyle == BasicStroke.JOIN_MITER) { //lineStroke = new BasicStroke((float) thickness, capStyle, joinStyle, miterLimit); @@ -684,10 +686,12 @@ public class BitmapExporter extends ShapeExporterBase { } else { graphics.setPaint(fillPaint); graphics.fill(shp); + /* if (Configuration.fixAntialiasConflation.get()) { Shape strokeShape = new BasicStroke((float) (1 * SWF.unitDivisor / unzoom), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND).createStrokedShape(shp); graphics.fill(strokeShape); } + */ } } if (linePaint != null && lineStroke != null) {