From e6c41b3e129970dc4ae7e5f44198594d2b94e998 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sun, 17 Jan 2016 17:48:00 +0100 Subject: [PATCH] #1133 Incorrect frame order for nested sprite --- libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java | 4 ++-- src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java | 2 +- 2 files changed, 3 insertions(+), 3 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 0d617ee37..0ec471555 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java @@ -2826,7 +2826,7 @@ public final class SWF implements SWFContainerItem, Timelined { if (timeline.fontFrameNum != -1) { dframe = timeline.fontFrameNum; } else { - dframe = (time + layer.time) % drawableFrameCount; + dframe = time % drawableFrameCount; } if (character instanceof ButtonTag) { @@ -2890,7 +2890,7 @@ public final class SWF implements SWFContainerItem, Timelined { img = new SerializableImage(newWidth, newHeight, SerializableImage.TYPE_INT_ARGB); img.fillTransparent(); - drawable.toImage(dframe, layer.time + time, layer.ratio, renderContext, img, m, clrTrans); + drawable.toImage(dframe, time, layer.ratio, renderContext, img, m, clrTrans); if (cacheKey != null) { renderContext.shapeCache.put(cacheKey, img); diff --git a/src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java b/src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java index 32370cee1..50911b63c 100644 --- a/src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java @@ -308,7 +308,7 @@ public class FolderPreviewPanel extends JPanel { zoom = ratio; } } - imgSrc = SWF.frameToImageGet(swf.getTimeline(), fn.frame, 0, null, 0, rect, new Matrix(), new ColorTransform(), null, true, zoom); + imgSrc = SWF.frameToImageGet(swf.getTimeline(), fn.frame, fn.frame, null, 0, rect, new Matrix(), new ColorTransform(), null, true, zoom); width = imgSrc.getWidth(); height = imgSrc.getHeight(); } else if (treeItem instanceof ImageTag) {