LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-03 18:04:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
Jindra Petřík
2016-01-17 22:03:50 +01:00
parent 9f1b2422f1 d1d7170ab7
commit b4d3471e43
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -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);

2
src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java
View File

@@ -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) {