LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-31 11:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
Jindra Petřík
2016-02-17 20:15:52 +01:00
parent 26fbb83ef3 130cddff08
commit 9a4daa2a32
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/ButtonTag.java
View File

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

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

@@ -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<Clip> clips = new Stack<>();