From 742e6fe1c0a06318d426a9afb4d2181c3f013009 Mon Sep 17 00:00:00 2001 From: Honfika Date: Mon, 24 Feb 2014 00:05:33 +0100 Subject: [PATCH] small cleanup --- .../jpexs/decompiler/flash/exporters/BitmapExporter.java | 8 -------- trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java | 1 - .../jpexs/decompiler/flash/tags/DefineEditTextTag.java | 2 +- .../com/jpexs/decompiler/flash/tags/DefineText2Tag.java | 2 +- .../com/jpexs/decompiler/flash/tags/DefineTextTag.java | 2 +- .../src/com/jpexs/decompiler/flash/tags/base/TextTag.java | 2 +- 6 files changed, 4 insertions(+), 13 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/exporters/BitmapExporter.java b/trunk/src/com/jpexs/decompiler/flash/exporters/BitmapExporter.java index f80a5dcf4..03a6d36b0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/exporters/BitmapExporter.java +++ b/trunk/src/com/jpexs/decompiler/flash/exporters/BitmapExporter.java @@ -65,15 +65,8 @@ public class BitmapExporter extends ShapeExporterBase implements IShapeExporter private Color lineColor; private Stroke lineStroke; private Stroke defaultStroke; - private Matrix transform; private double unitDivisor; - public static SerializableImage export(SWF swf, SHAPE shape) { - BitmapExporter exporter = new BitmapExporter(swf, shape, null); - exporter.export(); - return exporter.getImage(); - } - public static SerializableImage export(SWF swf, SHAPE shape, Color defaultColor) { BitmapExporter exporter = new BitmapExporter(swf, shape, defaultColor); exporter.export(); @@ -122,7 +115,6 @@ public class BitmapExporter extends ShapeExporterBase implements IShapeExporter private void exportTo(SerializableImage image, Matrix transformation) { this.image = image; - this.transform = transformation; graphics = (Graphics2D) image.getGraphics(); graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java index 220bb0637..f01348b2b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java @@ -138,7 +138,6 @@ public final class ImagePanel extends JPanel implements ActionListener, FlashDis m.translate(-rect.Xmin, -rect.Ymin); drawable.toImage(0, swf.tags, characters, new Stack(), image, m); img = image; - } else { img = drawable.toImage(0, swf.tags, characters, new Stack(), Matrix.getScaleInstance(1 / SWF.unitDivisor)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java index b231a0c5f..64e8752e6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java @@ -668,7 +668,7 @@ public class DefineEditTextTag extends TextTag implements DrawableTag { tr.glyphEntries[i].glyphAdvance = advance; } textRecords.add(tr); - staticTextToImage(swf, characters, textRecords, bounds, 1, image, getTextMatrix(), transformation); + staticTextToImage(swf, characters, textRecords, 1, image, getTextMatrix(), transformation); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java index 9fe5378d4..0dac13c15 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java @@ -498,7 +498,7 @@ public class DefineText2Tag extends TextTag implements DrawableTag { @Override public void toImage(int frame, List tags, Map characters, Stack visited, SerializableImage image, Matrix transformation) { - staticTextToImage(swf, characters, textRecords, textBounds, 2, image, getTextMatrix(), transformation); + staticTextToImage(swf, characters, textRecords, 2, image, getTextMatrix(), transformation); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java index 4b11db6c6..53774cab8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java @@ -514,7 +514,7 @@ public class DefineTextTag extends TextTag implements DrawableTag { @Override public void toImage(int frame, List tags, Map characters, Stack visited, SerializableImage image, Matrix transformation) { - staticTextToImage(swf, characters, textRecords, textBounds, 1, image, getTextMatrix(), transformation); + staticTextToImage(swf, characters, textRecords, 1, image, getTextMatrix(), transformation); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/TextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/TextTag.java index c04591283..d81270a92 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/base/TextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/TextTag.java @@ -192,7 +192,7 @@ public abstract class TextTag extends CharacterTag implements BoundedTag { return att; } - public static void staticTextToImage(SWF swf, Map characters, List textRecords, RECT textBounds, int numText, SerializableImage image, MATRIX textMatrix, Matrix transformation) { + public static void staticTextToImage(SWF swf, Map characters, List textRecords, int numText, SerializableImage image, MATRIX textMatrix, Matrix transformation) { Color textColor = new Color(0, 0, 0); FontTag font = null; int textHeight = 12;