From dfca43736ed083514eefa011f5cd3264e9c04103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 5 Nov 2022 10:27:33 +0100 Subject: [PATCH] Error color (red) extracted to constant in SWF class --- libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java | 5 +++++ .../decompiler/flash/exporters/shape/BitmapExporter.java | 6 ++---- .../flash/exporters/shape/CanvasShapeExporter.java | 2 +- .../decompiler/flash/tags/gfx/DefineExternalImage.java | 2 +- .../decompiler/flash/tags/gfx/DefineExternalImage2.java | 2 +- .../com/jpexs/decompiler/flash/tags/gfx/DefineSubImage.java | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) 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 953057d90..688c5b394 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java @@ -377,6 +377,11 @@ public final class SWF implements SWFContainerItem, Timelined { "CFX", // Compressed ScaleForm GFx "ABC" // Non-standard LZMA compressed Flash ); + + /** + * Color to paint when there is an error (missing image, ...) + */ + public static final Color ERROR_COLOR = Color.red; public void updateCharacters() { characters = 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 37a7eea04..8cfff8f4b 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 @@ -378,8 +378,7 @@ public class BitmapExporter extends ShapeExporterBase { } } - // fill with red in case any error - fillPaint = Color.RED; + fillPaint = SWF.ERROR_COLOR; fillTransform = matrix.toTransform(); } @@ -576,8 +575,7 @@ public class BitmapExporter extends ShapeExporterBase { } } - // fill with red in case any error - linePaint = Color.RED; + linePaint = SWF.ERROR_COLOR; lineTransform = matrix.toTransform(); } 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 afc89ca7e..f433f6812 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 @@ -277,7 +277,7 @@ public class CanvasShapeExporter extends ShapeExporterBase { } } - fillData.append("\tctx.fillStyle=").append(color(Color.RED.getRGB())).append(";\r\n"); + fillData.append("\tctx.fillStyle=").append(color(SWF.ERROR_COLOR.getRGB())).append(";\r\n"); } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java index 195a75254..2c2529de0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage.java @@ -126,7 +126,7 @@ public class DefineExternalImage extends ImageTag { serImage = new SerializableImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB_PRE); Graphics g = serImage.getGraphics(); - g.setColor(Color.red); + g.setColor(SWF.ERROR_COLOR); g.fillRect(0, 0, targetWidth, targetHeight); cachedImageFilename = null; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java index df93b629a..b8f69776d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineExternalImage2.java @@ -138,7 +138,7 @@ public class DefineExternalImage2 extends ImageTag { serImage = new SerializableImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB_PRE); Graphics g = serImage.getGraphics(); - g.setColor(Color.red); + g.setColor(SWF.ERROR_COLOR); g.fillRect(0, 0, targetWidth, targetHeight); cachedImageFilename = null; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineSubImage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineSubImage.java index a4f492124..026559894 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineSubImage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineSubImage.java @@ -158,7 +158,7 @@ public class DefineSubImage extends ImageTag { } serImage = new SerializableImage(x2 - x1, y2 - y1, BufferedImage.TYPE_INT_ARGB_PRE); Graphics g = serImage.getGraphics(); - g.setColor(Color.red); + g.setColor(SWF.ERROR_COLOR); g.fillRect(0, 0, x2 - x1, y2 - y1); cachedImageFilename = null; cachedX1 = x1;