From 130cddff085b36e7c95aa1e6e4d2cc923048c81d Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 17 Feb 2016 08:02:55 +0100 Subject: [PATCH] unused ratio parameter removed --- libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java | 2 +- .../src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java | 4 ++-- .../src/com/jpexs/decompiler/flash/tags/base/ButtonTag.java | 4 ++-- .../src/com/jpexs/decompiler/flash/timeline/Timeline.java | 4 ++-- src/com/jpexs/decompiler/flash/gui/ImagePanel.java | 2 +- 5 files changed, 8 insertions(+), 8 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 a16771274..01f5eff28 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java @@ -2672,7 +2672,7 @@ public final class SWF implements SWFContainerItem, Timelined { RenderContext renderContext = new RenderContext(); renderContext.cursorPosition = cursorPosition; renderContext.mouseButton = mouseButton; - timeline.toImage(frame, time, 0, renderContext, image, false, m, absoluteTransformation, colorTransform); + timeline.toImage(frame, time, renderContext, image, false, m, absoluteTransformation, colorTransform); return image; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java index f97134552..16d3a771c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java @@ -362,12 +362,12 @@ public class DefineSpriteTag extends CharacterTag implements DrawableTag, Timeli @Override public Shape getOutline(int frame, int time, int ratio, RenderContext renderContext, Matrix transformation) { - return getTimeline().getOutline(frame, time, ratio, renderContext, transformation); + return getTimeline().getOutline(frame, time, renderContext, transformation); } @Override public void toImage(int frame, int time, int ratio, RenderContext renderContext, SerializableImage image, boolean isClip, Matrix transformation, Matrix absoluteTransformation, ColorTransform colorTransform) { - getTimeline().toImage(frame, time, ratio, renderContext, image, isClip, transformation, absoluteTransformation, colorTransform); + getTimeline().toImage(frame, time, renderContext, image, isClip, transformation, absoluteTransformation, colorTransform); } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ButtonTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ButtonTag.java index 702997a61..c7f80836f 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ButtonTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ButtonTag.java @@ -88,12 +88,12 @@ public abstract class ButtonTag extends CharacterTag implements DrawableTag, Tim @Override public Shape getOutline(int frame, int time, int ratio, RenderContext renderContext, Matrix transformation) { - return getTimeline().getOutline(frame, time, ratio, renderContext, transformation); + return getTimeline().getOutline(frame, time, renderContext, transformation); } @Override public void toImage(int frame, int time, int ratio, RenderContext renderContext, SerializableImage image, boolean isClip, Matrix transformation, Matrix absoluteTransformation, ColorTransform colorTransform) { - getTimeline().toImage(frame, time, ratio, renderContext, image, isClip, transformation, absoluteTransformation, colorTransform); + getTimeline().toImage(frame, time, renderContext, image, isClip, transformation, absoluteTransformation, colorTransform); } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java index 5de944708..9b492dec8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java @@ -546,7 +546,7 @@ public class Timeline { return modified; } - public void toImage(int frame, int time, int ratio, RenderContext renderContext, SerializableImage image, boolean isClip, Matrix transformation, Matrix absoluteTransformation, ColorTransform colorTransform) { + public void toImage(int frame, int time, RenderContext renderContext, SerializableImage image, boolean isClip, Matrix transformation, Matrix absoluteTransformation, ColorTransform colorTransform) { double unzoom = SWF.unitDivisor; if (getFrameCount() <= frame) { return; @@ -1034,7 +1034,7 @@ public class Timeline { } } - public Shape getOutline(int frame, int time, int ratio, RenderContext renderContext, Matrix transformation) { + public Shape getOutline(int frame, int time, RenderContext renderContext, Matrix transformation) { Frame fr = getFrame(frame); Area area = new Area(); Stack clips = new Stack<>(); diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java index fa0ec7492..cc606b8af 100644 --- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java +++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java @@ -778,7 +778,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay { Matrix m = new Matrix(); m.translate(-rect.Xmin * zoom, -rect.Ymin * zoom); m.scale(zoom); - timeline.toImage(frame, time, frame, renderContext, image, false, m, m, null); + timeline.toImage(frame, time, renderContext, image, false, m, m, null); Graphics2D gg = (Graphics2D) image.getGraphics(); gg.setStroke(new BasicStroke(3));