From a410d5afed9990ba6443f58af09098dfbd1f2247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 22 Oct 2022 12:55:54 +0200 Subject: [PATCH] Fixed #1839 Sprite frames exported incorrectly and repeating --- CHANGELOG.md | 2 ++ .../com/jpexs/decompiler/flash/exporters/FrameExporter.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5e5fe931..32a58503e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. ### Fixed - [#1834] PlaceObject4 tags appear as Unresolved inside of DefineSprite +- [#1839] Sprite frames exported incorrectly and repeating ## [15.1.1] - 2022-07-03 ### Added @@ -2374,6 +2375,7 @@ All notable changes to this project will be documented in this file. [alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8 [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 [#1834]: https://www.free-decompiler.com/flash/issues/1834 +[#1839]: https://www.free-decompiler.com/flash/issues/1839 [#270]: https://www.free-decompiler.com/flash/issues/270 [#1718]: https://www.free-decompiler.com/flash/issues/1718 [#1801]: https://www.free-decompiler.com/flash/issues/1801 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/FrameExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/FrameExporter.java index ad6fbcd4f..a8dfd2d43 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/FrameExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/FrameExporter.java @@ -446,7 +446,7 @@ public class FrameExporter { } int fframe = fframes.get(pos++); - BufferedImage result = SWF.frameToImageGet(tim, fframe, fframe, null, 0, tim.displayRect, new Matrix(), null, fusesTransparency ? null : fbackgroundColor, settings.zoom).getBufferedImage(); + BufferedImage result = SWF.frameToImageGet(tim, fframe, 0, null, 0, tim.displayRect, new Matrix(), null, fusesTransparency ? null : fbackgroundColor, settings.zoom).getBufferedImage(); if (evl != null) { evl.handleExportedEvent("frame", pos, fframes.size(), tagName); @@ -588,7 +588,6 @@ public class FrameExporter { return ret; } - private static void drawText(float x, float y, Matrix trans, int textColor, Map existingFonts, FontTag font, String text, int textHeight, Graphics g) { int fontId = font.getFontId(); PDFGraphics g2 = (PDFGraphics) g;