diff --git a/.github/actions/spelling/candidate.patterns b/.github/actions/spelling/candidate.patterns index 8160d7ebd..93afe284a 100644 --- a/.github/actions/spelling/candidate.patterns +++ b/.github/actions/spelling/candidate.patterns @@ -462,7 +462,7 @@ Name\[[^\]]+\]=.* \b(?i)ml(?=[a-z]{2,}) # python -\b(?i)py(?!gments|gmy|lon|ramid|ro|th)(?=[a-z]{2,}) +#\b(?i)py(?!gments|gmy|lon|ramid|ro|th)(?=[a-z]{2,}) # scrypt / argon \$(?:scrypt|argon\d+[di]*)\$\S+ diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index 208daacf0..1aa5c7a97 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -133,4 +133,5 @@ Lexer\.java$ \.flv$ \.yml$ (?:^|/)build\.xml$ -^Dockerfile$ \ No newline at end of file +^Dockerfile$ +(?:^|/)DoAction\.as$ diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index eea0208b6..b2847fbdd 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -1441,7 +1441,7 @@ hilighting hilite hiliter hinst -HITTEST +hittest HIWORD HKEYBy HKLM @@ -2239,6 +2239,7 @@ movieclip moviesfolder MPEGLAYER mpis +msaa msb msc MSDTC @@ -3989,6 +3990,7 @@ xattrname xattrval xbar XBefore +xbt XButton xcenter xcontent diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/aa/AntialiasTools.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/aa/AntialiasTools.java index de92dea1e..b6f4a7d64 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/aa/AntialiasTools.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/aa/AntialiasTools.java @@ -145,15 +145,15 @@ public class AntialiasTools { } for (List contour : contours) { - IVec2[] ipts = isStroke ? toFixedContour(contour) : toCleanFixedContour(contour); - if (ipts == null || ipts.length < 2) { + IVec2[] iPts = isStroke ? toFixedContour(contour) : toCleanFixedContour(contour); + if (iPts == null || iPts.length < 2) { continue; } - path.moveTo(ipts[0].x / (float) FIXED_ONE, ipts[0].y / (float) FIXED_ONE); + path.moveTo(iPts[0].x / (float) FIXED_ONE, iPts[0].y / (float) FIXED_ONE); - for (int i = 1; i < ipts.length; i++) { - path.lineTo(ipts[i].x / (float) FIXED_ONE, ipts[i].y / (float) FIXED_ONE); + for (int i = 1; i < iPts.length; i++) { + path.lineTo(iPts[i].x / (float) FIXED_ONE, iPts[i].y / (float) FIXED_ONE); } if (close) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/aa/AntialiasedBitmapExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/aa/AntialiasedBitmapExporter.java index 89d6723b1..c9c4177d9 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/aa/AntialiasedBitmapExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/aa/AntialiasedBitmapExporter.java @@ -17,21 +17,16 @@ import java.awt.BasicStroke; import java.awt.Color; import java.awt.Graphics2D; import java.awt.MultipleGradientPaint; -import java.awt.Rectangle; import java.awt.Shape; import java.awt.Stroke; import java.awt.TexturePaint; import java.awt.geom.AffineTransform; import java.awt.geom.Path2D; import java.awt.geom.Point2D; -import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; -import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.imageio.ImageIO; /** * Antialiased Shape Bitmap Exporter @@ -53,7 +48,7 @@ public class AntialiasedBitmapExporter extends BitmapExporter { private boolean closeLine = false; - private double curveFlattness = 1.0; + private double curveFlatness = 1.0; private static final int BASE_TILE_SIZE = 4096; @@ -136,7 +131,7 @@ public class AntialiasedBitmapExporter extends BitmapExporter { vecTrans = vecTrans.preConcatenate(Matrix.getTranslateInstance(-shapeViewRect.xMin, -shapeViewRect.yMin)); - curveFlattness = 1.0 / aaScale; + curveFlatness = 1.0 / aaScale; this.image = image; this.scaleStrokes = scaleStrokes; graphics = (Graphics2D) image.getGraphics(); @@ -175,7 +170,7 @@ public class AntialiasedBitmapExporter extends BitmapExporter { AffineTransform t = new AffineTransform(graphics.getTransform()); t.preConcatenate(AffineTransform.getTranslateInstance(-shapeViewRect.xMin - tileSize * x, -shapeViewRect.yMin - tileSize * y)); clip = t.createTransformedShape(clip); - List> clipContours = AntialiasTools.shapeToContours(clip, curveFlattness); + List> clipContours = AntialiasTools.shapeToContours(clip, curveFlatness); rz.setClipContours(clipContours, Path2D.WIND_EVEN_ODD); } @@ -277,7 +272,7 @@ public class AntialiasedBitmapExporter extends BitmapExporter { Vec2 anchorVec2 = new Vec2(dst.getX(), dst.getY()); List contour = contours.get(contours.size() - 1); - AntialiasTools.append(contour, AntialiasTools.flattenQuadraticBezier(lastPos, controlVec2, anchorVec2, curveFlattness), true); + AntialiasTools.append(contour, AntialiasTools.flattenQuadraticBezier(lastPos, controlVec2, anchorVec2, curveFlatness), true); lastPos = anchorVec2; } @@ -349,7 +344,7 @@ public class AntialiasedBitmapExporter extends BitmapExporter { Stroke stroke = lineStroke == null ? defaultStroke : lineStroke; Shape shape = AntialiasTools.contoursToShape(contours, Path2D.WIND_EVEN_ODD, closeLine, true); Shape strokedShape = stroke.createStrokedShape(shape); - List> strokeContours = AntialiasTools.shapeToContours(strokedShape, curveFlattness); + List> strokeContours = AntialiasTools.shapeToContours(strokedShape, curveFlatness); if (linePaint != null && lineStroke != null) { if (linePaint instanceof MultipleGradientPaint) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/converters/TextTypeConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/converters/TextTypeConverter.java index 3ac288466..e0ad31816 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/converters/TextTypeConverter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/converters/TextTypeConverter.java @@ -32,9 +32,9 @@ import javax.xml.stream.XMLStreamException; */ public class TextTypeConverter { - public static int TEXT_TYPE_DEFINETEXT = 1; - public static int TEXT_TYPE_DEFINETEXT2 = 2; - public static int TEXT_TYPE_DEFINEEXITTEXT = 3; + public static int TEXT_TYPE_DEFINE_TEXT = 1; + public static int TEXT_TYPE_DEFINE_TEXT2 = 2; + public static int TEXT_TYPE_DEFINE_EDIT_TEXT = 3; /** * Converts static text version @@ -117,7 +117,7 @@ public class TextTypeConverter { } /** - * Convers static text (DefineText, DefineText2) to DefineEditText + * Converts static text (DefineText, DefineText2) to DefineEditText * * @param tag DefineText or DefineText2 * @param targetSWF Target SWF @@ -281,23 +281,23 @@ public class TextTypeConverter { public TextTag convertTagType(TextTag sourceTextTag, SWF targetSWF, int targetTextNum) { int currentTextNum; if (sourceTextTag instanceof DefineTextTag) { - currentTextNum = TextTypeConverter.TEXT_TYPE_DEFINETEXT; + currentTextNum = TextTypeConverter.TEXT_TYPE_DEFINE_TEXT; } else if (sourceTextTag instanceof DefineText2Tag) { - currentTextNum = TextTypeConverter.TEXT_TYPE_DEFINETEXT2; + currentTextNum = TextTypeConverter.TEXT_TYPE_DEFINE_TEXT2; } else if (sourceTextTag instanceof DefineEditTextTag) { - currentTextNum = TextTypeConverter.TEXT_TYPE_DEFINEEXITTEXT; + currentTextNum = TextTypeConverter.TEXT_TYPE_DEFINE_EDIT_TEXT; } else { throw new IllegalArgumentException("Invalid text"); } - if (currentTextNum < TEXT_TYPE_DEFINEEXITTEXT && targetTextNum < TEXT_TYPE_DEFINEEXITTEXT) { + if (currentTextNum < TEXT_TYPE_DEFINE_EDIT_TEXT && targetTextNum < TEXT_TYPE_DEFINE_EDIT_TEXT) { return convertStaticText((StaticTextTag) sourceTextTag, targetTextNum, targetSWF); } - if (currentTextNum < TEXT_TYPE_DEFINEEXITTEXT && targetTextNum == TEXT_TYPE_DEFINEEXITTEXT) { + if (currentTextNum < TEXT_TYPE_DEFINE_EDIT_TEXT && targetTextNum == TEXT_TYPE_DEFINE_EDIT_TEXT) { return staticTextToEditText((StaticTextTag) sourceTextTag, targetSWF); } - if (currentTextNum == TEXT_TYPE_DEFINEEXITTEXT && targetTextNum < TEXT_TYPE_DEFINEEXITTEXT) { + if (currentTextNum == TEXT_TYPE_DEFINE_EDIT_TEXT && targetTextNum < TEXT_TYPE_DEFINE_EDIT_TEXT) { return editTextToStaticText((DefineEditTextTag) sourceTextTag, targetTextNum, targetSWF); } diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java index d295c699a..6cd1fc081 100644 --- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java @@ -3023,11 +3023,11 @@ public class TagTreeContextMenu extends JPopupMenu { if (itemr.size() == 1) { TextTag t = (TextTag) itemr.get(0); if (t instanceof DefineTextTag) { - currentTextType = TextTypeConverter.TEXT_TYPE_DEFINETEXT; + currentTextType = TextTypeConverter.TEXT_TYPE_DEFINE_TEXT; } else if (t instanceof DefineText2Tag) { - currentTextType = TextTypeConverter.TEXT_TYPE_DEFINETEXT2; + currentTextType = TextTypeConverter.TEXT_TYPE_DEFINE_TEXT2; } else if (t instanceof DefineEditTextTag) { - currentTextType = TextTypeConverter.TEXT_TYPE_DEFINEEXITTEXT; + currentTextType = TextTypeConverter.TEXT_TYPE_DEFINE_EDIT_TEXT; } }