[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-531-g02a6d98

[Benjamin Wolsey]

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  02a6d988ec61557fa4c2b3c7b1215bbd2406fae1 (commit)
       via  deccb1bce6aeef25f5d56bb60213d43ed3887410 (commit)
      from  e98c536313d35e69060a190055d6eeaa985c4a10 (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=02a6d988ec61557fa4c2b3c7b1215bbd2406fae1


commit 02a6d988ec61557fa4c2b3c7b1215bbd2406fae1
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Apr 7 12:34:24 2011 +0200

    Try constructing a boost::zip_iterator
    
    Some boost/gcc combinations fail to compile zip_iterator code,
    so test on the buildbots before doing any more work.

diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp 
b/libcore/asobj/flash/display/BitmapData_as.cpp
index 17c377d..739b9ee 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -25,6 +25,8 @@
 #include <algorithm>
 #include <queue>
 #include <boost/random.hpp>
+#include <boost/iterator/zip_iterator.hpp>
+#include <boost/tuple/tuple.hpp>
 
 #include "MovieClip.h"
 #include "GnashImage.h"
@@ -582,6 +584,8 @@ bitmapdata_copyChannel(const fn_call& fn)
     assert(destX + destW <= static_cast<int>(ptr->width()));
     assert(destY + destH <= static_cast<int>(ptr->height()));
 
+    boost::make_zip_iterator(boost::make_tuple(src, targ));
+
     // Copy for the width and height of the *dest* image.
     // We have already ensured that the copied area
     // is inside both bitmapdatas.

http://git.savannah.gnu.org/cgit//commit/?id=deccb1bce6aeef25f5d56bb60213d43ed3887410


commit deccb1bce6aeef25f5d56bb60213d43ed3887410
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Apr 7 12:33:58 2011 +0200

    Fix copy paste error

diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp 
b/libcore/asobj/flash/display/BitmapData_as.cpp
index bf5b677..17c377d 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -567,7 +567,7 @@ bitmapdata_copyChannel(const fn_call& fn)
     if (destW == 0 || destH == 0) {
         // The target rect does not overlap with source bitmap
         IF_VERBOSE_ASCODING_ERRORS(
-            log_aserror("BitmapData.copyPixels(): destination area is "
+            log_aserror("BitmapData.copyChannel(): destination area is "
                 "wholly outside the destination BitmapData");
         );
         return as_value();

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

Summary of changes:
 libcore/asobj/flash/display/BitmapData_as.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash