Merge commit 'mental/copyPixels-alpha-nomask'

10 files changed, 6 insertions, 4 deletions

diff --git a/swfdec/swfdec_bitmap_data.c b/swfdec/swfdec_bitmap_data.c
index 041b448a..01919fed 100644
--- a/swfdec/swfdec_bitmap_data.c
+++ b/swfdec/swfdec_bitmap_data.c
@@ -426,7 +426,7 @@ swfdec_bitmap_data_copyPixels (SwfdecAsContext *cx, SwfdecAsObject *object,
   cairo_t *cr;
   int x, y;
 
-  SWFDEC_AS_CHECK (SWFDEC_TYPE_BITMAP_DATA, &bitmap, "ooo|oob", &so, &recto, &pt,
+  SWFDEC_AS_CHECK (SWFDEC_TYPE_BITMAP_DATA, &bitmap, "ooo|OOb", &so, &recto, &pt,
       &ao, &apt, &copy_alpha);
 
   if (bitmap->surface == NULL ||
diff --git a/test/image/BitmapData-copyPixels-5.swf b/test/image/BitmapData-copyPixels-5.swf
index 853a71c9..9fa8043c 100644
--- a/test/image/BitmapData-copyPixels-5.swf
+++ b/test/image/BitmapData-copyPixels-5.swf
diff --git a/test/image/BitmapData-copyPixels-5.swf.png b/test/image/BitmapData-copyPixels-5.swf.png
index 60dd59cd..e8d1b929 100644
--- a/test/image/BitmapData-copyPixels-5.swf.png
+++ b/test/image/BitmapData-copyPixels-5.swf.png
diff --git a/test/image/BitmapData-copyPixels-6.swf b/test/image/BitmapData-copyPixels-6.swf
index d0beb561..48b07773 100644
--- a/test/image/BitmapData-copyPixels-6.swf
+++ b/test/image/BitmapData-copyPixels-6.swf
diff --git a/test/image/BitmapData-copyPixels-6.swf.png b/test/image/BitmapData-copyPixels-6.swf.png
index 777880ae..e8d1b929 100644
--- a/test/image/BitmapData-copyPixels-6.swf.png
+++ b/test/image/BitmapData-copyPixels-6.swf.png
diff --git a/test/image/BitmapData-copyPixels-7.swf b/test/image/BitmapData-copyPixels-7.swf
index 748ddda4..7040f0b7 100644
--- a/test/image/BitmapData-copyPixels-7.swf
+++ b/test/image/BitmapData-copyPixels-7.swf
diff --git a/test/image/BitmapData-copyPixels-7.swf.png b/test/image/BitmapData-copyPixels-7.swf.png
index f8f4bb16..e8d1b929 100644
--- a/test/image/BitmapData-copyPixels-7.swf.png
+++ b/test/image/BitmapData-copyPixels-7.swf.png
diff --git a/test/image/BitmapData-copyPixels-8.swf b/test/image/BitmapData-copyPixels-8.swf
index d1e14c3c..9f962dd3 100644
--- a/test/image/BitmapData-copyPixels-8.swf
+++ b/test/image/BitmapData-copyPixels-8.swf
diff --git a/test/image/BitmapData-copyPixels-8.swf.png b/test/image/BitmapData-copyPixels-8.swf.png
index 275f35bc..7a47760b 100644
--- a/test/image/BitmapData-copyPixels-8.swf.png
+++ b/test/image/BitmapData-copyPixels-8.swf.png
diff --git a/test/image/BitmapData-copyPixels.as b/test/image/BitmapData-copyPixels.as
index d71b4ffe..0e762f90 100644
--- a/test/image/BitmapData-copyPixels.as
+++ b/test/image/BitmapData-copyPixels.as
@@ -1,4 +1,4 @@
-// makeswf -v 7 -s 200x150 -r 1 -o BitmapData-copyPixels.swf BitmapData-copyPixels.as
+// makeswf -v 7 -s 300x150 -r 1 -o BitmapData-copyPixels.swf BitmapData-copyPixels.as
 
 trans = new flash.display.BitmapData (50, 50, true, 0);
 for (x = 0; x < 17; x++) {
@@ -33,12 +33,14 @@ for (y = 1; y < 50; y *= 2) {
 array = [ trans, opa, mask ];
 
 for (y = 0; y < 3; y++) {
-  for (x = 0; x < 4; x++) {
+  for (x = 0; x < 6; 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
+    else if (x < 4)
       bm.copyPixels (trans, { x: 20, y: 20, width: 20, height: 20 }, { x: 11, y: 11 }, mask, { x: 0, y: 0}, x == 3);
+    else
+      bm.copyPixels (trans, { x: 20, y: 20, width: 20, height: 20 }, { x: 11, y: 11 }, null, null, x == 5);
     a = createEmptyMovieClip ("image" + getNextHighestDepth (), getNextHighestDepth ());
     a.attachBitmap (bm, 0);
     a._x = x * 50;