[Gnash-commit] [SCM] Gnash branch, master, updated. cbf1446d20df8875abd3a036b454be7c0b346ca2

[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  cbf1446d20df8875abd3a036b454be7c0b346ca2 (commit)
       via  6038d1321370f8dfcdf9d1dea4897a33d30e4076 (commit)
       via  87655f6c197f5f5a12313e2848f685e4800d09e4 (commit)
       via  71d6ae31c93634be0fe4b64d631df443fcfe32e3 (commit)
      from  2041ab2c22c73dc053b35e6a12b58b2e6c1e8c5b (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=cbf1446d20df8875abd3a036b454be7c0b346ca2


commit cbf1446d20df8875abd3a036b454be7c0b346ca2
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Dec 9 11:11:56 2010 +0100

    Fix silly type usage.

diff --git a/libcore/MovieClip.cpp b/libcore/MovieClip.cpp
index 0b666f8..6e0fe54 100644
--- a/libcore/MovieClip.cpp
+++ b/libcore/MovieClip.cpp
@@ -923,7 +923,7 @@ MovieClip::advance()
         log_debug(_("MovieClip::advance_movieclip we're in PLAYSTATE_PLAY 
mode"));
 #endif
 
-        int prev_frame = _currentFrame;
+        const size_t prev_frame = _currentFrame;
 
 #ifdef GNASH_DEBUG
         log_debug(_("on_event_load called, incrementing"));
@@ -936,18 +936,16 @@ MovieClip::advance()
         // Execute the current frame's tags.
         // First time executeFrameTags(0) executed in dlist.cpp(child) or
         // SWFMovieDefinition(root)
-        if (_currentFrame != (size_t)prev_frame)
-        {
-            if (_currentFrame == 0 && _hasLooped)
-            {
+        if (_currentFrame != prev_frame) {
+
+            if (_currentFrame == 0 && _hasLooped) {
 #ifdef GNASH_DEBUG
                 log_debug(_("Jumping back to frame 0 of movieclip %s"),
                         getTarget());
 #endif
                 restoreDisplayList(0); // seems OK to me.
             }
-            else
-            {
+            else {
 #ifdef GNASH_DEBUG
                 log_debug(_("Executing frame%d (0-based) tags of movieclip "
                             "%s"), _currentFrame, getTarget());
@@ -962,12 +960,10 @@ MovieClip::advance()
 
     }
 #ifdef GNASH_DEBUG
-    else
-    {
+    else {
         log_debug(_("MovieClip::advance_movieclip we're in STOP mode"));
     }
 #endif
-
 }
 
 void
@@ -975,8 +971,7 @@ MovieClip::execute_init_action_buffer(const action_buffer& 
a, int cid)
 {
     assert(cid >= 0);
 
-    if ( _swf->initializeCharacter(cid) )
-    {
+    if (_swf->initializeCharacter(cid)) {
 #ifdef GNASH_DEBUG
         log_debug(_("Queuing init actions in frame %d of movieclip %s"),
                 _currentFrame, getTarget());
@@ -985,8 +980,7 @@ MovieClip::execute_init_action_buffer(const action_buffer& 
a, int cid)
 
         stage().pushAction(code, movie_root::PRIORITY_INIT);
     }
-    else
-    {
+    else {
 #ifdef GNASH_DEBUG
         log_debug(_("Init actions for DisplayObject %d already executed"), 
cid);
 #endif

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


commit 6038d1321370f8dfcdf9d1dea4897a33d30e4076
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Dec 9 10:10:43 2010 +0100

    Drop unused function.

diff --git a/libcore/MovieClip.cpp b/libcore/MovieClip.cpp
index 6b50a8a..0b666f8 100644
--- a/libcore/MovieClip.cpp
+++ b/libcore/MovieClip.cpp
@@ -726,21 +726,8 @@ MovieClip::queueAction(const action_buffer& action)
 }
 
 void
-MovieClip::queueActions(const ActionList& actions)
-{
-    for (ActionList::const_iterator it=actions.begin(), itEnd=actions.end();
-                     it != itEnd; ++it)
-    {
-        const action_buffer* buf = *it;
-        queueAction(*buf);
-    }
-
-}
-
-void
 MovieClip::notifyEvent(const event_id& id)
 {
-
 #ifdef GNASH_DEBUG
     log_debug(_("Event %s invoked for movieclip %s"), id, getTarget());
 #endif
diff --git a/libcore/MovieClip.h b/libcore/MovieClip.h
index 38a8830..a4e6aee 100644
--- a/libcore/MovieClip.h
+++ b/libcore/MovieClip.h
@@ -714,13 +714,6 @@ private:
     ///
     void restoreDisplayList(size_t targetFrame);
 
-    /// Queue actions in the action list
-    //
-    /// The list of action will be pushed on the current
-    /// global list (see movie_root).
-    ///
-    void queueActions(const ActionList& action_list);
-
     /// Execute the actions in the action list
     //
     /// The list of action will be consumed starting from the first

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


commit 87655f6c197f5f5a12313e2848f685e4800d09e4
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Dec 9 10:07:24 2010 +0100

    Attempts to clone root or non-movieclips are AS coding errors.

diff --git a/libcore/MovieClip.cpp b/libcore/MovieClip.cpp
index 98e4dcf..6b50a8a 100644
--- a/libcore/MovieClip.cpp
+++ b/libcore/MovieClip.cpp
@@ -675,14 +675,19 @@ MovieClip::duplicateMovieClip(const std::string& newname, 
int depth,
 {
     DisplayObject* parent_ch = parent();
     if (!parent_ch) {
-        log_error(_("Can't clone root of the movie"));
-        return NULL;
+        IF_VERBOSE_ASCODING_ERRORS(
+            log_aserror(_("Can't clone root of the movie"));
+        );
+        return 0;
     }
+
     MovieClip* parent = parent_ch->to_movie();
-    if ( ! parent )
-    {
-        log_error(_("%s parent is not a movieclip, can't clone"), getTarget());
-        return NULL;
+    if (!parent) {
+        IF_VERBOSE_ASCODING_ERRORS(
+            log_error(_("%s parent is not a movieclip, can't clone"),
+                getTarget());
+        );
+        return 0;
     }
 
     as_object* o = getObjectWithPrototype(getGlobal(*getObject(this)), 

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


commit 71d6ae31c93634be0fe4b64d631df443fcfe32e3
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Dec 9 10:05:37 2010 +0100

    Use aserror instead of error.

diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp 
b/libcore/asobj/flash/display/BitmapData_as.cpp
index db20bb0..19ecb54 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -788,7 +788,9 @@ bitmapdata_rectangle(const fn_call& fn)
     boost::intrusive_ptr<as_function> rectCtor = rectangle.to_function();
 
     if (!rectCtor) {
-        log_error("Failed to construct flash.geom.Rectangle!");
+        IF_VERBOSE_ASCODING_ERRORS(
+            log_aserror("Failed to construct flash.geom.Rectangle!");
+        );
         return -1;
     }
 

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

Summary of changes:
 libcore/MovieClip.cpp                         |   52 +++++++++----------------
 libcore/MovieClip.h                           |    7 ---
 libcore/asobj/flash/display/BitmapData_as.cpp |    4 +-
 3 files changed, 22 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
Gnash