[Swfdec-commits] 8 commits - swfdec/swfdec_image.c test/custom test/gnash test/image test/trace
Benjamin Otte
company at kemper.freedesktop.org
Tue Jul 29 14:58:59 PDT 2008
dev/null |binary
swfdec/swfdec_image.c | 3
test/custom/Makefile.am | 2
test/gnash/actionscript.all/Makefile.am | 2
test/gnash/misc-mtasc.all/Makefile.am | 2
test/gnash/misc-mtasc.all/implementsOp/BExtendingImplementation.as | 28 -
test/gnash/misc-mtasc.all/implementsOp/ExtendingImplementation.as | 28 +
test/gnash/misc-swfc.all/Makefile.am | 2
test/gnash/misc-swfmill.all/Makefile.am | 2
test/image/BitmapData-copyPixels-5.swf |binary
test/image/BitmapData-copyPixels-5.swf.png |binary
test/image/BitmapData-copyPixels-6.swf |binary
test/image/BitmapData-copyPixels-6.swf.png |binary
test/image/BitmapData-copyPixels-7.swf |binary
test/image/BitmapData-copyPixels-7.swf.png |binary
test/image/BitmapData-copyPixels-8.swf |binary
test/image/BitmapData-copyPixels-8.swf.png |binary
test/image/BitmapData-copyPixels.as | 47 ++
test/image/BitmapData-draw-5.swf |binary
test/image/BitmapData-draw-5.swf.png |binary
test/image/BitmapData-draw-6.swf |binary
test/image/BitmapData-draw-6.swf.png |binary
test/image/BitmapData-draw-7.swf |binary
test/image/BitmapData-draw-7.swf.png |binary
test/image/BitmapData-draw-8.swf |binary
test/image/BitmapData-draw-8.swf.png |binary
test/image/BitmapData-draw.as | 101 ++++++
test/image/Makefile.am | 20 +
test/image/image-jpeg-alpha.swf.png |binary
test/trace/Makefile.am | 5
test/trace/onload-events.swf.trace | 3
test/trace/onload-events.xml | 166 ----------
32 files changed, 204 insertions(+), 207 deletions(-)
New commits:
commit a869303c76c295cba78707391c1300ac5fc9a3e0
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Jul 29 23:23:24 2008 +0200
rework the way we call swfdec-test again
This way doesn't hit the 32k limit for command line args
diff --git a/test/gnash/actionscript.all/Makefile.am b/test/gnash/actionscript.all/Makefile.am
index 8217325..809aa05 100644
--- a/test/gnash/actionscript.all/Makefile.am
+++ b/test/gnash/actionscript.all/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../../swfdec-test
- ../../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
+ CUR_DIR=`pwd`; cd $(srcdir) && $$CUR_DIR/../../swfdec-test *.swf
EXTRA_DIST = \
README \
diff --git a/test/gnash/misc-mtasc.all/Makefile.am b/test/gnash/misc-mtasc.all/Makefile.am
index 591d099..46e833d 100644
--- a/test/gnash/misc-mtasc.all/Makefile.am
+++ b/test/gnash/misc-mtasc.all/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../../swfdec-test
- ../../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
+ CUR_DIR=`pwd`; cd $(srcdir) && $$CUR_DIR/../../swfdec-test *.swf
EXTRA_DIST = \
README \
diff --git a/test/gnash/misc-swfc.all/Makefile.am b/test/gnash/misc-swfc.all/Makefile.am
index 5ef29f8..58a6a8a 100644
--- a/test/gnash/misc-swfc.all/Makefile.am
+++ b/test/gnash/misc-swfc.all/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../../swfdec-test
- ../../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
+ CUR_DIR=`pwd`; cd $(srcdir) && $$CUR_DIR/../../swfdec-test *.swf
EXTRA_DIST = \
README \
diff --git a/test/gnash/misc-swfmill.all/Makefile.am b/test/gnash/misc-swfmill.all/Makefile.am
index ac7d6c3..4f0552e 100644
--- a/test/gnash/misc-swfmill.all/Makefile.am
+++ b/test/gnash/misc-swfmill.all/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../../swfdec-test
- ../../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
+ CUR_DIR=`pwd`; cd $(srcdir) && $$CUR_DIR/../../swfdec-test *.swf
EXTRA_DIST = \
README \
diff --git a/test/image/Makefile.am b/test/image/Makefile.am
index f27464e..b90c376 100644
--- a/test/image/Makefile.am
+++ b/test/image/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../swfdec-test
- ../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
+ CUR_DIR=`pwd`; cd $(srcdir) && $$CUR_DIR/../swfdec-test *.swf
EXTRA_DIST = \
BitmapData-copyPixels-5.swf \
diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index d946c22..085ac85 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../swfdec-test
- ../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
+ CUR_DIR=`pwd`; cd $(srcdir) && $$CUR_DIR/../swfdec-test *.swf
EXTRA_DIST = \
README \
commit 2f4ebaf8d77b304f4876d1e30c56fbe409632758
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Jul 29 22:54:13 2008 +0200
fix typo
diff --git a/test/gnash/misc-mtasc.all/implementsOp/BExtendingImplementation.as b/test/gnash/misc-mtasc.all/implementsOp/BExtendingImplementation.as
deleted file mode 100644
index 7a4a8da..0000000
--- a/test/gnash/misc-mtasc.all/implementsOp/BExtendingImplementation.as
+++ /dev/null
@@ -1,28 +0,0 @@
-// BExtendingImplementation.as - ??
-//
-// Copyright (C) 2007 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-import ImplementationB;
-
-class implementsOp.BExtendingImplementation extends implementsOp.ImplementationB {
-
- function doMoreStuff(param1:String, param2:Number):String {
- return "overriding implementation";
- }
-
-}
diff --git a/test/gnash/misc-mtasc.all/implementsOp/ExtendingImplementation.as b/test/gnash/misc-mtasc.all/implementsOp/ExtendingImplementation.as
new file mode 100644
index 0000000..7a4a8da
--- /dev/null
+++ b/test/gnash/misc-mtasc.all/implementsOp/ExtendingImplementation.as
@@ -0,0 +1,28 @@
+// BExtendingImplementation.as - ??
+//
+// Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+import ImplementationB;
+
+class implementsOp.BExtendingImplementation extends implementsOp.ImplementationB {
+
+ function doMoreStuff(param1:String, param2:Number):String {
+ return "overriding implementation";
+ }
+
+}
commit 30ea931e5a583ee29c932658be66dbefb7d5041b
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Jul 29 22:49:34 2008 +0200
add a test for BitmapData.copyPixels
diff --git a/test/image/BitmapData-copyPixels-5.swf b/test/image/BitmapData-copyPixels-5.swf
new file mode 100644
index 0000000..853a71c
Binary files /dev/null and b/test/image/BitmapData-copyPixels-5.swf differ
diff --git a/test/image/BitmapData-copyPixels-5.swf.png b/test/image/BitmapData-copyPixels-5.swf.png
new file mode 100644
index 0000000..60dd59c
Binary files /dev/null and b/test/image/BitmapData-copyPixels-5.swf.png differ
diff --git a/test/image/BitmapData-copyPixels-6.swf b/test/image/BitmapData-copyPixels-6.swf
new file mode 100644
index 0000000..d0beb56
Binary files /dev/null and b/test/image/BitmapData-copyPixels-6.swf differ
diff --git a/test/image/BitmapData-copyPixels-6.swf.png b/test/image/BitmapData-copyPixels-6.swf.png
new file mode 100644
index 0000000..777880a
Binary files /dev/null and b/test/image/BitmapData-copyPixels-6.swf.png differ
diff --git a/test/image/BitmapData-copyPixels-7.swf b/test/image/BitmapData-copyPixels-7.swf
new file mode 100644
index 0000000..748ddda
Binary files /dev/null and b/test/image/BitmapData-copyPixels-7.swf differ
diff --git a/test/image/BitmapData-copyPixels-7.swf.png b/test/image/BitmapData-copyPixels-7.swf.png
new file mode 100644
index 0000000..f8f4bb1
Binary files /dev/null and b/test/image/BitmapData-copyPixels-7.swf.png differ
diff --git a/test/image/BitmapData-copyPixels-8.swf b/test/image/BitmapData-copyPixels-8.swf
new file mode 100644
index 0000000..d1e14c3
Binary files /dev/null and b/test/image/BitmapData-copyPixels-8.swf differ
diff --git a/test/image/BitmapData-copyPixels-8.swf.png b/test/image/BitmapData-copyPixels-8.swf.png
new file mode 100644
index 0000000..275f35b
Binary files /dev/null and b/test/image/BitmapData-copyPixels-8.swf.png differ
diff --git a/test/image/BitmapData-copyPixels.as b/test/image/BitmapData-copyPixels.as
new file mode 100644
index 0000000..d71b4ff
--- /dev/null
+++ b/test/image/BitmapData-copyPixels.as
@@ -0,0 +1,47 @@
+// makeswf -v 7 -s 200x150 -r 1 -o BitmapData-copyPixels.swf BitmapData-copyPixels.as
+
+trans = new flash.display.BitmapData (50, 50, true, 0);
+for (x = 0; x < 17; x++) {
+ for (y = 0; y < 17; y++) {
+ trans.setPixel32 (2 * x + 8, 2 * y + 8, x * 0xF0F0F00 | y * 0xF);
+ trans.setPixel32 (2 * x + 9, 2 * y + 8, x * 0xF0F0F00 | y * 0xF);
+ trans.setPixel32 (2 * x + 8, 2 * y + 9, x * 0xF0F0F00 | y * 0xF);
+ trans.setPixel32 (2 * x + 9, 2 * y + 9, x * 0xF0F0F00 | y * 0xF);
+ }
+}
+
+opa = new flash.display.BitmapData (50, 50, false, 0);
+for (x = 0; x < 17; x++) {
+ for (y = 0; y < 17; y++) {
+ opa.setPixel32 (2 * x + 8, 2 * y + 8, x * 0xF000F0F | y * 0xF0000);
+ opa.setPixel32 (2 * x + 9, 2 * y + 8, x * 0xF000F0F | y * 0xF0000);
+ opa.setPixel32 (2 * x + 8, 2 * y + 9, x * 0xF000F0F | y * 0xF0000);
+ opa.setPixel32 (2 * x + 9, 2 * y + 9, x * 0xF000F0F | y * 0xF0000);
+ }
+}
+
+mask = new flash.display.BitmapData (50, 50, true, 0);
+for (x = 0; x < 50; x += 3) {
+ mask.setPixel32 (x, 0, x * 0x05000000);
+ mask.setPixel32 (x + 2, 0, x * 0x05000000);
+ mask.setPixel32 (x + 1, 0, x * 0x05000000);
+}
+for (y = 1; y < 50; y *= 2) {
+ mask.copyPixels (mask, { x: 0, y: 0, width: 50, height: y }, { x: 0, y: y });
+}
+
+array = [ trans, opa, mask ];
+
+for (y = 0; y < 3; y++) {
+ for (x = 0; x < 4; x++) {
+ bm = array[y].clone ();
+ if (x < 2)
+ bm.copyPixels (array[x % 2], { x: 20, y: 20, width: 20, height: 20 }, { x: 11, y: 11 });
+ else
+ bm.copyPixels (trans, { x: 20, y: 20, width: 20, height: 20 }, { x: 11, y: 11 }, mask, { x: 0, y: 0}, x == 3);
+ a = createEmptyMovieClip ("image" + getNextHighestDepth (), getNextHighestDepth ());
+ a.attachBitmap (bm, 0);
+ a._x = x * 50;
+ a._y = y * 50;
+ }
+}
diff --git a/test/image/Makefile.am b/test/image/Makefile.am
index 19488f8..f27464e 100644
--- a/test/image/Makefile.am
+++ b/test/image/Makefile.am
@@ -2,6 +2,15 @@ check-local: ../swfdec-test
../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
EXTRA_DIST = \
+ BitmapData-copyPixels-5.swf \
+ BitmapData-copyPixels-5.swf.png \
+ BitmapData-copyPixels-6.swf \
+ BitmapData-copyPixels-6.swf.png \
+ BitmapData-copyPixels-7.swf \
+ BitmapData-copyPixels-7.swf.png \
+ BitmapData-copyPixels-8.swf \
+ BitmapData-copyPixels-8.swf.png \
+ BitmapData-copyPixels.as \
BitmapData-creation-5.swf \
BitmapData-creation-5.swf.png \
BitmapData-creation-6.swf \
commit 088cdff1084990a71f15d31c6372bb6eb2ea54f5
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Jul 29 22:48:48 2008 +0200
add a test for BitmapData.draw
diff --git a/test/image/BitmapData-draw-5.swf b/test/image/BitmapData-draw-5.swf
new file mode 100644
index 0000000..2580f86
Binary files /dev/null and b/test/image/BitmapData-draw-5.swf differ
diff --git a/test/image/BitmapData-draw-5.swf.png b/test/image/BitmapData-draw-5.swf.png
new file mode 100644
index 0000000..3bda8d2
Binary files /dev/null and b/test/image/BitmapData-draw-5.swf.png differ
diff --git a/test/image/BitmapData-draw-6.swf b/test/image/BitmapData-draw-6.swf
new file mode 100644
index 0000000..994af1b
Binary files /dev/null and b/test/image/BitmapData-draw-6.swf differ
diff --git a/test/image/BitmapData-draw-6.swf.png b/test/image/BitmapData-draw-6.swf.png
new file mode 100644
index 0000000..5bdfe97
Binary files /dev/null and b/test/image/BitmapData-draw-6.swf.png differ
diff --git a/test/image/BitmapData-draw-7.swf b/test/image/BitmapData-draw-7.swf
new file mode 100644
index 0000000..0dea081
Binary files /dev/null and b/test/image/BitmapData-draw-7.swf differ
diff --git a/test/image/BitmapData-draw-7.swf.png b/test/image/BitmapData-draw-7.swf.png
new file mode 100644
index 0000000..693d7a0
Binary files /dev/null and b/test/image/BitmapData-draw-7.swf.png differ
diff --git a/test/image/BitmapData-draw-8.swf b/test/image/BitmapData-draw-8.swf
new file mode 100644
index 0000000..c2c0c55
Binary files /dev/null and b/test/image/BitmapData-draw-8.swf differ
diff --git a/test/image/BitmapData-draw-8.swf.png b/test/image/BitmapData-draw-8.swf.png
new file mode 100644
index 0000000..458a8f9
Binary files /dev/null and b/test/image/BitmapData-draw-8.swf.png differ
diff --git a/test/image/BitmapData-draw.as b/test/image/BitmapData-draw.as
new file mode 100644
index 0000000..44269ec
--- /dev/null
+++ b/test/image/BitmapData-draw.as
@@ -0,0 +1,101 @@
+// makeswf -v 7 -s 200x150 -r 1 -o BitmapData-draw.swf BitmapData-draw.as
+
+rectangle = function (mc, color, x, y, w, h)
+{
+ mc.beginFill (color);
+ mc.moveTo (x, y);
+ mc.lineTo (x, y + h);
+ mc.lineTo (x + w, y + h);
+ mc.lineTo (x + w, y);
+ mc.lineTo (x, y);
+ mc.endFill ();
+};
+
+createEmptyMovieClip ("a", 0);
+rectangle (a, 0xFF, 0, 0, 50, 50);
+createEmptyMovieClip ("b", 1);
+rectangle (b, 0xFF00, 10, 10, 30, 30);
+a.setMask (b);
+
+a._visible = false;
+bg = new flash.display.BitmapData (50, 50);
+bg.draw (a);
+createEmptyMovieClip ("c", 2);
+c.attachBitmap (bg, 0);
+c._y = 50;
+
+a._visible = true;
+bg = new flash.display.BitmapData (50, 50);
+bg.draw (a);
+createEmptyMovieClip ("d", 3);
+d.attachBitmap (bg, 0);
+d._y = 100;
+
+bg = new flash.display.BitmapData (50, 50);
+bg.draw (b);
+createEmptyMovieClip ("e", 4);
+e.attachBitmap (bg, 0);
+e._x = 50;
+e._y = 50;
+
+b._visible = false;
+bg = new flash.display.BitmapData (50, 50);
+bg.draw (b);
+createEmptyMovieClip ("f", 5);
+f.attachBitmap (bg, 0);
+f._x = 50;
+f._y = 100;
+
+bg = new flash.display.BitmapData (50, 50);
+bg.draw (a);
+fg = new flash.display.BitmapData (50, 50);
+fg.draw (bg);
+createEmptyMovieClip ("g", 6);
+g.attachBitmap (fg, 0);
+g._x = 50;
+
+createEmptyMovieClip ("aa", 100);
+rectangle (aa, 0xFF0000, 0, 0, 50, 50);
+aa._visible = false;
+fg = new flash.display.BitmapData (50, 50);
+fg.draw (aa, { a: "1.0", b: { valueOf: function () { return 0; }}, c: false, d: 1, tx: 0, ty: NaN });
+createEmptyMovieClip ("h", 7);
+h.attachBitmap (fg, 0);
+h._x = 100;
+
+fg = new flash.display.BitmapData (50, 50);
+fg.draw (bg, { a: 0, b: 1, c: 0.5, d: 0, tx: 5, ty: -5 });
+createEmptyMovieClip ("i", 8);
+i.attachBitmap (fg, 0);
+i._x = 100;
+i._y = 50;
+
+fg = new flash.display.BitmapData (50, 50);
+fg.draw (a, new flash.geom.Matrix (), new flash.geom.ColorTransform (1, 0, 0, 1, 0, 255, 0, 255));
+createEmptyMovieClip ("j", 9);
+j.attachBitmap (fg, 0);
+j._x = 100;
+j._y = 100;
+
+bg = new flash.display.BitmapData (50, 50, true, 0);
+for (x = 0; x < 17; x++) {
+ for (y = 0; y < 17; y++) {
+ bg.setPixel32 (2 * x + 8, 2 * y + 8, x * 0xF0F0000 | y * 0xF0);
+ bg.setPixel32 (2 * x + 9, 2 * y + 8, x * 0xF0F0000 | y * 0xF0);
+ bg.setPixel32 (2 * x + 8, 2 * y + 9, x * 0xF0F0000 | y * 0xF0);
+ bg.setPixel32 (2 * x + 9, 2 * y + 9, x * 0xF0F0000 | y * 0xF0);
+ }
+}
+bg.setPixel32 (0, 0, 0xFF00FF00);
+bg.setPixel32 (1, 0, 0);
+
+createEmptyMovieClip ("k", 10);
+k.attachBitmap (bg, 0);
+k._x = 150;
+
+fg = new flash.display.BitmapData (50, 50);
+fg.draw (bg, new flash.geom.Matrix (), new flash.geom.ColorTransform (0.5, 0, 0, 1, 0, 255, 0, 255));
+createEmptyMovieClip ("l", 11);
+l.attachBitmap (fg, 0);
+l._x = 150;
+l._y = 50;
diff --git a/test/image/Makefile.am b/test/image/Makefile.am
index 961b9e4..19488f8 100644
--- a/test/image/Makefile.am
+++ b/test/image/Makefile.am
@@ -11,6 +11,15 @@ EXTRA_DIST = \
BitmapData-creation-8.swf \
BitmapData-creation-8.swf.png \
BitmapData-creation.as \
+ BitmapData-draw-5.swf \
+ BitmapData-draw-5.swf.png \
+ BitmapData-draw-6.swf \
+ BitmapData-draw-6.swf.png \
+ BitmapData-draw-7.swf \
+ BitmapData-draw-7.swf.png \
+ BitmapData-draw-8.swf \
+ BitmapData-draw-8.swf.png \
+ BitmapData-draw.as \
README \
background-5.swf \
background-5.swf.png \
commit 24dc30aedcd793938473c6423be0786c7c75ece0
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Jul 29 22:19:03 2008 +0200
update reference image
The last commit just fixed the cause for it
diff --git a/test/image/image-jpeg-alpha.swf.png b/test/image/image-jpeg-alpha.swf.png
index 922577a..a6aeb48 100644
Binary files a/test/image/image-jpeg-alpha.swf.png and b/test/image/image-jpeg-alpha.swf.png differ
commit bbb2fbb54b8707c5b181a12675299f02dbfe4b4b
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Jul 29 22:03:22 2008 +0200
ensure the image does not oversaturate colors when merging alpha
diff --git a/swfdec/swfdec_image.c b/swfdec/swfdec_image.c
index d1e7bae..92bef53 100644
--- a/swfdec/swfdec_image.c
+++ b/swfdec/swfdec_image.c
@@ -286,6 +286,9 @@ merge_alpha (SwfdecImage * image, unsigned char *image_data,
p = image_data + y * image->width * 4;
for (x = 0; x < image->width; x++) {
p[SWFDEC_COLOR_INDEX_ALPHA] = *alpha;
+ p[SWFDEC_COLOR_INDEX_RED] = MIN (*alpha, p[SWFDEC_COLOR_INDEX_RED]);
+ p[SWFDEC_COLOR_INDEX_GREEN] = MIN (*alpha, p[SWFDEC_COLOR_INDEX_GREEN]);
+ p[SWFDEC_COLOR_INDEX_BLUE] = MIN (*alpha, p[SWFDEC_COLOR_INDEX_BLUE]);
p += 4;
alpha++;
}
commit 80319981ecb410024f17d0533d8b5f959d62369c
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Jul 29 14:42:08 2008 +0200
make tests pass the full path to the tests as the URL
diff --git a/test/custom/Makefile.am b/test/custom/Makefile.am
index 746e12e..991a22c 100644
--- a/test/custom/Makefile.am
+++ b/test/custom/Makefile.am
@@ -1,6 +1,6 @@
check-local: ../swfdec-test
for file in $(srcdir)/*.sts; do \
- ../swfdec-test --script $$file $(srcdir)/`basename $$file .sts`*.swf || exit $?; \
+ ../swfdec-test --script $$file `cd $(srcdir) && pwd`/`basename $$file .sts`*.swf || exit $?; \
done
EXTRA_DIST = \
diff --git a/test/gnash/actionscript.all/Makefile.am b/test/gnash/actionscript.all/Makefile.am
index 4484f9d..8217325 100644
--- a/test/gnash/actionscript.all/Makefile.am
+++ b/test/gnash/actionscript.all/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../../swfdec-test
- ../../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
+ ../../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
EXTRA_DIST = \
README \
diff --git a/test/gnash/misc-mtasc.all/Makefile.am b/test/gnash/misc-mtasc.all/Makefile.am
index c795e97..591d099 100644
--- a/test/gnash/misc-mtasc.all/Makefile.am
+++ b/test/gnash/misc-mtasc.all/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../../swfdec-test
- ../../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
+ ../../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
EXTRA_DIST = \
README \
diff --git a/test/gnash/misc-swfc.all/Makefile.am b/test/gnash/misc-swfc.all/Makefile.am
index 3fffebb..5ef29f8 100644
--- a/test/gnash/misc-swfc.all/Makefile.am
+++ b/test/gnash/misc-swfc.all/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../../swfdec-test
- ../../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
+ ../../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
EXTRA_DIST = \
README \
diff --git a/test/gnash/misc-swfmill.all/Makefile.am b/test/gnash/misc-swfmill.all/Makefile.am
index 9174b5a..ac7d6c3 100644
--- a/test/gnash/misc-swfmill.all/Makefile.am
+++ b/test/gnash/misc-swfmill.all/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../../swfdec-test
- ../../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
+ ../../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
EXTRA_DIST = \
README \
diff --git a/test/image/Makefile.am b/test/image/Makefile.am
index 2418fa3..961b9e4 100644
--- a/test/image/Makefile.am
+++ b/test/image/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../swfdec-test
- ../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
+ ../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
EXTRA_DIST = \
BitmapData-creation-5.swf \
diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index f7e0489..d946c22 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -1,5 +1,5 @@
check-local: ../swfdec-test
- ../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
+ ../swfdec-test --script $(srcdir)/default.sts `cd $(srcdir) && pwd`/*.swf
EXTRA_DIST = \
README \
commit 3116d43c1dba0fb02898506786779f36b964033c
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Jul 29 12:59:16 2008 +0200
remove test that we don't pass
diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index 9a84071..f7e0489 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -2476,9 +2476,6 @@ EXTRA_DIST = \
onload-childparent.c \
onload-childparent.swf \
onload-childparent.swf.trace \
- onload-events.swf \
- onload-events.swf.trace \
- onload-events.xml \
onresize.as \
onresize-5.swf \
onresize-5.swf.trace \
diff --git a/test/trace/onload-events.swf b/test/trace/onload-events.swf
deleted file mode 100644
index 06bfaa8..0000000
Binary files a/test/trace/onload-events.swf and /dev/null differ
diff --git a/test/trace/onload-events.swf.trace b/test/trace/onload-events.swf.trace
deleted file mode 100644
index 88c94ee..0000000
--- a/test/trace/onload-events.swf.trace
+++ /dev/null
@@ -1,3 +0,0 @@
-onLoad with and without events in PlaceObject2
-mc2 onLoad
-mc3 onLoad
diff --git a/test/trace/onload-events.xml b/test/trace/onload-events.xml
deleted file mode 100644
index efac84d..0000000
--- a/test/trace/onload-events.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0"?>
-<swf version="8" compressed="1">
- <Header framerate="15" frames="2">
- <size>
- <Rectangle left="0" right="2000" top="0" bottom="3000"/>
- </size>
- <tags>
- <FileAttributes hasMetaData="0" useNetwork="0"/>
- <DefineSprite objectID="1" frames="1">
- <tags>
- <ShowFrame/>
- <End/>
- </tags>
- </DefineSprite>
- <DefineSprite objectID="2" frames="1">
- <tags>
- <ShowFrame/>
- <End/>
- </tags>
- </DefineSprite>
- <DefineSprite objectID="3" frames="1">
- <tags>
- <ShowFrame/>
- <End/>
- </tags>
- </DefineSprite>
- <Export>
- <symbols>
- <Symbol objectID="1" name="mc1"/>
- </symbols>
- </Export>
- <Export>
- <symbols>
- <Symbol objectID="2" name="mc2"/>
- </symbols>
- </Export>
- <Export>
- <symbols>
- <Symbol objectID="3" name="mc3"/>
- </symbols>
- </Export>
- <ShowFrame/>
- <DoAction>
- <actions>
- <Dictionary>
- <strings>
- <String value="mc1"/>
- <String value="onLoad"/>
- <String value="mc1 onLoad"/>
- <String value="mc2"/>
- <String value="mc2 onLoad"/>
- <String value="mc3"/>
- <String value="mc3 onLoad"/>
- <String value="fscommand:quit"/>
- <String value=""/>
- <String value="onLoad with and without events in PlaceObject2"/>
- </strings>
- </Dictionary>
- <PushData>
- <items>
- <StackDictionaryLookup index="9"/>
- </items>
- </PushData>
- <Trace/>
- <GetVariable/>
- <PushData>
- <items>
- <StackDictionaryLookup index="0"/>
- </items>
- </PushData>
- <GetVariable/>
- <PushData>
- <items>
- <StackDictionaryLookup index="1"/>
- </items>
- </PushData>
- <DeclareFunction2 name="" argc="0" regc="0" preloadThis="0" suppressThis="0" preloadArguments="0" suppressArguments="0" preloadSuper="0" suppressSuper="0" preloadRoot="0" preloadParent="0" preloadGlobal="0" reserved="0">
- <args/>
- <actions>
- <PushData>
- <items>
- <StackDictionaryLookup index="2"/>
- </items>
- </PushData>
- <Trace/>
- </actions>
- </DeclareFunction2>
- <SetMember/>
- <PushData>
- <items>
- <StackDictionaryLookup index="3"/>
- </items>
- </PushData>
- <GetVariable/>
- <PushData>
- <items>
- <StackDictionaryLookup index="1"/>
- </items>
- </PushData>
- <DeclareFunction2 name="" argc="0" regc="0" preloadThis="0" suppressThis="0" preloadArguments="0" suppressArguments="0" preloadSuper="0" suppressSuper="0" preloadRoot="0" preloadParent="0" preloadGlobal="0" reserved="0">
- <args/>
- <actions>
- <PushData>
- <items>
- <StackDictionaryLookup index="4"/>
- </items>
- </PushData>
- <Trace/>
- </actions>
- </DeclareFunction2>
- <SetMember/>
- <PushData>
- <items>
- <StackDictionaryLookup index="5"/>
- </items>
- </PushData>
- <GetVariable/>
- <PushData>
- <items>
- <StackDictionaryLookup index="1"/>
- </items>
- </PushData>
- <DeclareFunction2 name="" argc="0" regc="0" preloadThis="0" suppressThis="0" preloadArguments="0" suppressArguments="0" preloadSuper="0" suppressSuper="0" preloadRoot="0" preloadParent="0" preloadGlobal="0" reserved="0">
- <args/>
- <actions>
- <PushData>
- <items>
- <StackDictionaryLookup index="6"/>
- </items>
- </PushData>
- <Trace/>
- </actions>
- </DeclareFunction2>
- <SetMember/>
- <PushData>
- <items>
- <StackDictionaryLookup index="7"/>
- <StackDictionaryLookup index="8"/>
- </items>
- </PushData>
- <GetURL2 method="0"/>
- <Stop/>
- <EndAction/>
- </actions>
- </DoAction>
- <PlaceObject2 replace="0" depth="0" objectID="1" name="mc1"/>
- <PlaceObject2 replace="0" depth="1" objectID="2" name="mc2">
- <events>
- <Event flags1="512" flags2="0">
- <actions>
- <EndAction/>
- </actions>
- </Event>
- <Event flags1="0" flags2="0"/>
- </events>
- </PlaceObject2>
- <PlaceObject2 replace="0" depth="2" objectID="3" name="mc3">
- <events>
- <Event flags1="0" flags2="0"/>
- </events>
- </PlaceObject2>
- <ShowFrame/>
- <End/>
- </tags>
- </Header>
-</swf>
More information about the Swfdec-commits
mailing list