[Gnash-commit] gnash ChangeLog server/swf/RemoveObjectTag.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/07 21:37:15

Modified files:
        .              : ChangeLog 
        server/swf     : RemoveObjectTag.cpp 

Log message:
                * server/swf/RemoveObjectTag.cpp (loader): don't attempt to 
unregister
                  a timeline depth if depth is out of the static zone. 
PlaceObject2
                  does the same avoiding to register the depth in this case. 
Fixes bug
                  #21281.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4562&r2=1.4563
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/RemoveObjectTag.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4562
retrieving revision 1.4563
diff -u -b -r1.4562 -r1.4563
--- ChangeLog   7 Oct 2007 21:11:50 -0000       1.4562
+++ ChangeLog   7 Oct 2007 21:37:15 -0000       1.4563
@@ -1,5 +1,9 @@
 2007-10-06 Sandro Santilli <address@hidden>
 
+       * server/swf/RemoveObjectTag.cpp (loader): don't attempt to unregister
+         a timeline depth if depth is out of the static zone. PlaceObject2
+         does the same avoiding to register the depth in this case. Fixes bug
+         #21281.
        * server/parser/movie_def_impl.cpp (dump_tag_bytes): output cleanup.
 
 2007-10-07 Chad Musick <address@hidden>

Index: server/swf/RemoveObjectTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/RemoveObjectTag.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/swf/RemoveObjectTag.cpp      1 Jul 2007 10:54:35 -0000       1.4
+++ server/swf/RemoveObjectTag.cpp      7 Oct 2007 21:37:15 -0000       1.5
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: RemoveObjectTag.cpp,v 1.4 2007/07/01 10:54:35 bjacques Exp $ */
+/* $Id: RemoveObjectTag.cpp,v 1.5 2007/10/07 21:37:15 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -63,12 +63,21 @@
     std::auto_ptr<RemoveObjectTag> t ( new RemoveObjectTag );
     t->read(in, tag);
 
+    int depth = t->getDepth();
+
     IF_VERBOSE_PARSE
     (
-       log_parse(_("  remove_object_2(%d)"), t->getDepth());
+       log_parse(_("  remove_object_2(%d)"), depth);
     );
 
-    m->removeTimelineDepth(t->getDepth());
+    if ( depth < 0 && depth >= character::staticDepthOffset )
+    {
+        m->removeTimelineDepth(depth);
+    }
+    else
+    {
+       log_debug("RemoveObjectTag depth %d is out of static depth zone. Won't 
unregister its TimelineDepth.", depth);
+    }
 
     // Ownership transferred to movie_definition
     m->add_execute_tag(t.release());