Merge branch '0.8'

Conflicts:

	swfdec/swfdec_bitmap_data.c

10 files changed, 16 insertions, 0 deletions

diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index 75b4aafc..6b443fc3 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -1059,6 +1059,15 @@ EXTRA_DIST = \
 	crash-0.8.0-huffmann-table-8.swf \
 	crash-0.8.0-huffmann-table-8.swf.trace \
 	crash-0.8.0-huffmann-table.xml \
+	crash-0.8.2-copyPixels-5.swf \
+	crash-0.8.2-copyPixels-5.swf.trace \
+	crash-0.8.2-copyPixels-6.swf \
+	crash-0.8.2-copyPixels-6.swf.trace \
+	crash-0.8.2-copyPixels-7.swf \
+	crash-0.8.2-copyPixels-7.swf.trace \
+	crash-0.8.2-copyPixels-8.swf \
+	crash-0.8.2-copyPixels-8.swf.trace \
+	crash-0.8.2-copyPixels.as \
 	crash-0.8.2-gotoAndPlay-5.swf \
 	crash-0.8.2-gotoAndPlay-5.swf.trace \
 	crash-0.8.2-gotoAndPlay-6.swf \
diff --git a/test/trace/crash-0.8.2-copyPixels-5.swf b/test/trace/crash-0.8.2-copyPixels-5.swf
new file mode 100644
index 00000000..442360d3
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels-5.swf
diff --git a/test/trace/crash-0.8.2-copyPixels-5.swf.trace b/test/trace/crash-0.8.2-copyPixels-5.swf.trace
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels-5.swf.trace
diff --git a/test/trace/crash-0.8.2-copyPixels-6.swf b/test/trace/crash-0.8.2-copyPixels-6.swf
new file mode 100644
index 00000000..16ead005
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels-6.swf
diff --git a/test/trace/crash-0.8.2-copyPixels-6.swf.trace b/test/trace/crash-0.8.2-copyPixels-6.swf.trace
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels-6.swf.trace
diff --git a/test/trace/crash-0.8.2-copyPixels-7.swf b/test/trace/crash-0.8.2-copyPixels-7.swf
new file mode 100644
index 00000000..c433c195
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels-7.swf
diff --git a/test/trace/crash-0.8.2-copyPixels-7.swf.trace b/test/trace/crash-0.8.2-copyPixels-7.swf.trace
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels-7.swf.trace
diff --git a/test/trace/crash-0.8.2-copyPixels-8.swf b/test/trace/crash-0.8.2-copyPixels-8.swf
new file mode 100644
index 00000000..a7fe0741
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels-8.swf
diff --git a/test/trace/crash-0.8.2-copyPixels-8.swf.trace b/test/trace/crash-0.8.2-copyPixels-8.swf.trace
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels-8.swf.trace
diff --git a/test/trace/crash-0.8.2-copyPixels.as b/test/trace/crash-0.8.2-copyPixels.as
new file mode 100644
index 00000000..4e9b9fcb
--- /dev/null
+++ b/test/trace/crash-0.8.2-copyPixels.as
@@ -0,0 +1,7 @@
+// makeswf -v 7 -s 200x150 -r 1 -o crash-0.8.2-copyPixels.swf crash-0.8.2-copyPixels.as
+
+bd = new flash.display.BitmapData (50, 50);
+bd.copyPixels (bd, {}, {}, null);
+bd.copyPixels (bd, {}, {}, bd, {}, null);
+
+getURL ("fscommand:quit", "");