[Gnash-commit] gnash ChangeLog server/execute_tag.h server/spr...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/22 09:39:44

Modified files:
        .              : ChangeLog 
        server         : execute_tag.h sprite_instance.cpp 
        server/swf     : tag_loaders.cpp 

Log message:
                * server/: execute_tag.h, sprite_instance.cpp, 
swf/tag_loaders.cpp:
                  Simplified get_depth_id_of_replace_or_add_tag() interface to 
NOT
                  use negative numbers (return 0 for 
non-place-or-replace-chars).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1995&r2=1.1996
http://cvs.savannah.gnu.org/viewcvs/gnash/server/execute_tag.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1995
retrieving revision 1.1996
diff -u -b -r1.1995 -r1.1996
--- ChangeLog   22 Dec 2006 09:20:59 -0000      1.1995
+++ ChangeLog   22 Dec 2006 09:39:43 -0000      1.1996
@@ -1,3 +1,9 @@
+2006-12-22 Sandro Santilli <address@hidden>
+
+       * server/: execute_tag.h, sprite_instance.cpp, swf/tag_loaders.cpp:
+         Simplified get_depth_id_of_replace_or_add_tag() interface to NOT
+         use negative numbers (return 0 for non-place-or-replace-chars).
+
 2006-12-22 Zou Lunkai <address@hidden>
 
        * gui/sdl_agg_glue.cpp (render): fix black 

Index: server/execute_tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/execute_tag.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/execute_tag.h        21 Nov 2006 00:25:46 -0000      1.6
+++ server/execute_tag.h        22 Dec 2006 09:39:43 -0000      1.7
@@ -62,9 +62,15 @@
 
        virtual bool    is_action_tag() const { return false; }
 
+       /// \brief
+       /// Return 16-bit depth and id of character packed into one 32-bit int
+       /// IFF this is a replace or add tag, otherwise return 0.
+       //
+       /// The default implementation returns 0
+       ///
        virtual uint32  get_depth_id_of_replace_or_add_tag() const
        {
-               return static_cast<uint32>(-1);
+               return 0;
        }
 };
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- server/sprite_instance.cpp  21 Dec 2006 12:06:52 -0000      1.113
+++ server/sprite_instance.cpp  22 Dec 2006 09:39:44 -0000      1.114
@@ -2091,7 +2091,7 @@
                                for (unsigned int i = 0; i < playlist.size(); 
i++)
                                {
                                        uint16 depth = 
(playlist[i]->get_depth_id_of_replace_or_add_tag()) >> 16;
-                                       if (depth != static_cast<uint16>(-1))
+                                       if (depth != 0)
                                        {
                                                
affected_depths.push_back(depth);
                                        }

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/swf/tag_loaders.cpp  13 Dec 2006 10:23:30 -0000      1.66
+++ server/swf/tag_loaders.cpp  22 Dec 2006 09:39:44 -0000      1.67
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: tag_loaders.cpp,v 1.66 2006/12/13 10:23:30 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.67 2006/12/22 09:39:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1137,24 +1137,21 @@
            }
        }
     
-       /// "depth_id" is the 16-bit depth & id packed into one 32-bit int.
        virtual uint32  get_depth_id_of_replace_or_add_tag() const
        {
+               uint32 depthid = 0;
            if (m_place_type == PLACE || m_place_type == REPLACE)
                {
-                   int id = -1;
+                       int id = 0;
                    if (m_tag_type == SWF::PLACEOBJECT)
                        {
                            // Old-style PlaceObject; the corresponding Remove
                            // is specific to the character_id.
                            id = m_character_id;
                        }
-                   return ((m_depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
-               }
-           else
-               {
-                   return (uint32) -1;
+                       depthid = ((m_depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
                }
+               return depthid;
        }
 };