From 176bf911ce1e7dbf861217bb36eb4fe885d53917 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Mon, 18 Jan 2016 18:54:54 +0100 Subject: [PATCH] #1133 Incorrect frame order for nested sprite: internal viewer and frame export fix --- .../com/jpexs/decompiler/flash/exporters/FrameExporter.java | 3 ++- src/com/jpexs/decompiler/flash/gui/ImagePanel.java | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 ed790ed02..d7c7e14de 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 @@ -358,7 +358,8 @@ public class FrameExporter { evl.handleExportingEvent("frame", pos + 1, fframes.size(), tagName); } - BufferedImage result = SWF.frameToImageGet(ftim, fframes.get(pos++), 0, null, 0, ftim.displayRect, new Matrix(), new ColorTransform(), fbackgroundColor, false, settings.zoom).getBufferedImage(); + int fframe = fframes.get(pos++); + BufferedImage result = SWF.frameToImageGet(ftim, fframe, fframe, null, 0, ftim.displayRect, new Matrix(), new ColorTransform(), fbackgroundColor, false, settings.zoom).getBufferedImage(); if (evl != null) { evl.handleExportedEvent("frame", pos, fframes.size(), tagName); diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java index 7780a197a..7315c676c 100644 --- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java +++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java @@ -776,10 +776,9 @@ public final class ImagePanel extends JPanel implements MediaDisplay { stopAllSounds(); } frame = newframe; - time = 0; - } else { - time++; } + + time++; } }