[Swfdec-commits] 3 commits - swfdec/swfdec_movie.c test/.gitignore test/image
Benjamin Otte
company at kemper.freedesktop.org
Fri Oct 10 10:15:06 PDT 2008
swfdec/swfdec_movie.c | 16 ++++------------
test/.gitignore | 1 +
test/image/Makefile.am | 11 +++++++++++
test/image/rotated-filter-size-5.swf |binary
test/image/rotated-filter-size-5.swf.png |binary
test/image/rotated-filter-size-6.swf |binary
test/image/rotated-filter-size-6.swf.org.png |binary
test/image/rotated-filter-size-6.swf.png |binary
test/image/rotated-filter-size-7.swf |binary
test/image/rotated-filter-size-7.swf.org.png |binary
test/image/rotated-filter-size-7.swf.png |binary
test/image/rotated-filter-size-8.swf |binary
test/image/rotated-filter-size-8.swf.png |binary
test/image/rotated-filter-size.as | 25 +++++++++++++++++++++++++
14 files changed, 41 insertions(+), 12 deletions(-)
New commits:
commit 7c4655a8a40e8a20f2f6f651e6836e22bf34f503
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Oct 10 14:18:28 2008 +0200
update .gitignore
diff --git a/test/.gitignore b/test/.gitignore
index 16b89ee..f4d4f5e 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -5,4 +5,5 @@
swfdec_test_function_list.h
compiler
+crashfinder
swfdec-test
commit 5527d7dab4253bab268928d9d9aecf954a34ea9d
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Oct 10 14:17:13 2008 +0200
add test for recent fix
diff --git a/test/image/Makefile.am b/test/image/Makefile.am
index 00c6276..52e035d 100644
--- a/test/image/Makefile.am
+++ b/test/image/Makefile.am
@@ -471,6 +471,17 @@ EXTRA_DIST = \
replace-shape-shape-6.swf.png \
replace-shape-shape-7.swf \
replace-shape-shape-7.swf.png \
+ rotated-filter-size-5.swf \
+ rotated-filter-size-5.swf.png \
+ rotated-filter-size-6.swf \
+ rotated-filter-size-6.swf.org.png \
+ rotated-filter-size-6.swf.png \
+ rotated-filter-size-7.swf \
+ rotated-filter-size-7.swf.org.png \
+ rotated-filter-size-7.swf.png \
+ rotated-filter-size-8.swf \
+ rotated-filter-size-8.swf.png \
+ rotated-filter-size.as \
setMask-matrices-5.swf \
setMask-matrices-5.swf.png \
setMask-matrices-6.swf \
diff --git a/test/image/rotated-filter-size-5.swf b/test/image/rotated-filter-size-5.swf
new file mode 100644
index 0000000..849508e
Binary files /dev/null and b/test/image/rotated-filter-size-5.swf differ
diff --git a/test/image/rotated-filter-size-5.swf.png b/test/image/rotated-filter-size-5.swf.png
new file mode 100644
index 0000000..1c191a2
Binary files /dev/null and b/test/image/rotated-filter-size-5.swf.png differ
diff --git a/test/image/rotated-filter-size-6.swf b/test/image/rotated-filter-size-6.swf
new file mode 100644
index 0000000..544cf79
Binary files /dev/null and b/test/image/rotated-filter-size-6.swf differ
diff --git a/test/image/rotated-filter-size-6.swf.org.png b/test/image/rotated-filter-size-6.swf.org.png
new file mode 100644
index 0000000..a44a0dd
Binary files /dev/null and b/test/image/rotated-filter-size-6.swf.org.png differ
diff --git a/test/image/rotated-filter-size-6.swf.png b/test/image/rotated-filter-size-6.swf.png
new file mode 100644
index 0000000..ec60d94
Binary files /dev/null and b/test/image/rotated-filter-size-6.swf.png differ
diff --git a/test/image/rotated-filter-size-7.swf b/test/image/rotated-filter-size-7.swf
new file mode 100644
index 0000000..01cf6c0
Binary files /dev/null and b/test/image/rotated-filter-size-7.swf differ
diff --git a/test/image/rotated-filter-size-7.swf.org.png b/test/image/rotated-filter-size-7.swf.org.png
new file mode 100644
index 0000000..a44a0dd
Binary files /dev/null and b/test/image/rotated-filter-size-7.swf.org.png differ
diff --git a/test/image/rotated-filter-size-7.swf.png b/test/image/rotated-filter-size-7.swf.png
new file mode 100644
index 0000000..ec60d94
Binary files /dev/null and b/test/image/rotated-filter-size-7.swf.png differ
diff --git a/test/image/rotated-filter-size-8.swf b/test/image/rotated-filter-size-8.swf
new file mode 100644
index 0000000..d3636c6
Binary files /dev/null and b/test/image/rotated-filter-size-8.swf differ
diff --git a/test/image/rotated-filter-size-8.swf.png b/test/image/rotated-filter-size-8.swf.png
new file mode 100644
index 0000000..91f888f
Binary files /dev/null and b/test/image/rotated-filter-size-8.swf.png differ
diff --git a/test/image/rotated-filter-size.as b/test/image/rotated-filter-size.as
new file mode 100644
index 0000000..3d2f82e
--- /dev/null
+++ b/test/image/rotated-filter-size.as
@@ -0,0 +1,25 @@
+// makeswf -v 7 -s 200x150 -r 1 -o rotated-filter-size.swf rotated-filter-size.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);
+a._x = 100;
+a._y = 75;
+a.filters = [ new flash.filters.ColorMatrixFilter ([0, 0, 0, 0, 255,
+ 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 255])];
+
+a._rotation = 120;
+
+//getURL ("fscommand:quit", "");
commit 1b8b10b032e002c258d97f9d17f48cf3fe3a8437
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Oct 10 14:01:46 2008 +0200
make swfdec_movie_rect_local_to_global() work
It used to fail on rotated rectangles
diff --git a/swfdec/swfdec_movie.c b/swfdec/swfdec_movie.c
index c491df7..cb92ab4 100644
--- a/swfdec/swfdec_movie.c
+++ b/swfdec/swfdec_movie.c
@@ -501,21 +501,13 @@ swfdec_movie_local_to_global (SwfdecMovie *movie, double *x, double *y)
void
swfdec_movie_rect_local_to_global (SwfdecMovie *movie, SwfdecRect *rect)
{
+ cairo_matrix_t matrix;
+
g_return_if_fail (SWFDEC_IS_MOVIE (movie));
g_return_if_fail (rect != NULL);
- swfdec_movie_local_to_global (movie, &rect->x0, &rect->y0);
- swfdec_movie_local_to_global (movie, &rect->x1, &rect->y1);
- if (rect->x0 > rect->x1) {
- double tmp = rect->x1;
- rect->x1 = rect->x0;
- rect->x0 = tmp;
- }
- if (rect->y0 > rect->y1) {
- double tmp = rect->y1;
- rect->y1 = rect->y0;
- rect->y0 = tmp;
- }
+ swfdec_movie_local_to_global_matrix (movie, &matrix);
+ swfdec_rect_transform (rect, rect, &matrix);
}
void
More information about the Swfdec-commits
mailing list