[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1599-g880ee12

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  880ee12f40397b45d4f96935fc03d8a81ecb8e26 (commit)
      from  e05d45cf63944873dbdba4f89c78d17bf36e7c12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=880ee12f40397b45d4f96935fc03d8a81ecb8e26


commit 880ee12f40397b45d4f96935fc03d8a81ecb8e26
Author: Jürgen Rühle <address@hidden>
Date:   Fri Feb 8 21:43:31 2013 +0100

    Temporarily reset MovieClip's Matrix during draw operation
    
    Works around rendering problem with GemCraft Chapter One,
    gives 3 unexpected successes and no failures in our testsuite.

diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp 
b/libcore/asobj/flash/display/BitmapData_as.cpp
index cca2139..273aabc 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -1099,7 +1099,11 @@ bitmapdata_draw(const fn_call& fn)
         }
     }
 
+    SWFMatrix oldM = mc->transform().matrix;
+    mc->setMatrix(t.matrix, true);
     ptr->draw(*mc, t);
+    mc->setMatrix(oldM, true);
+
     return as_value();
 }
 
diff --git a/testsuite/actionscript.all/BitmapData.as 
b/testsuite/actionscript.all/BitmapData.as
index 19f6a4c..107fcf7 100644
--- a/testsuite/actionscript.all/BitmapData.as
+++ b/testsuite/actionscript.all/BitmapData.as
@@ -535,7 +535,7 @@ check(near(bm, 5, 5, 0xffffff));
 check(near(bm, 5, 15, 0xffffff));
 check(near(bm, 5, 25, 0xffffff));
 check(near(bm, 15, 5, 0xffffff));
-xcheck(near(bm, 15, 15, 0x00ff00));
+check(near(bm, 15, 15, 0x00ff00));
 check(near(bm, 15, 25, 0xffffff));
 check(near(bm, 25, 5, 0xffffff));
 check(near(bm, 25, 15, 0xffffff));
@@ -556,7 +556,7 @@ check(near(bm, 15, 5, 0xffffff));
 check(near(bm, 15, 15, 0xffffff));
 check(near(bm, 15, 25, 0xffffff));
 check(near(bm, 25, 5, 0xffffff));
-xcheck(near(bm, 25, 15, 0x0000ff));
+check(near(bm, 25, 15, 0x0000ff));
 check(near(bm, 25, 25, 0xffffff));
 
 bm = new flash.display.BitmapData(50, 50, false);
@@ -570,7 +570,7 @@ check(near(bm, 15, 5, 0xffffff));
 check(near(bm, 15, 15, 0xffffff));
 check(near(bm, 15, 25, 0xffffff));
 check(near(bm, 25, 5, 0xffffff));
-xcheck(near(bm, 23, 15, 0x00ff00));
+check(near(bm, 23, 15, 0x00ff00));
 xcheck(near(bm, 25, 15, 0x0000ff));
 check(near(bm, 25, 25, 0xffffff));
 

-----------------------------------------------------------------------

Summary of changes:
 libcore/asobj/flash/display/BitmapData_as.cpp |    4 ++++
 testsuite/actionscript.all/BitmapData.as      |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash