CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/22 12:53:55
Modified files:
. : ChangeLog
server : sprite_instance.cpp
Log message:
ignore the call when target and source characters have the same depth.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5463&r2=1.5464
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.455&r2=1.456
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5463
retrieving revision 1.5464
diff -u -b -r1.5463 -r1.5464
--- ChangeLog 22 Jan 2008 10:45:01 -0000 1.5463
+++ ChangeLog 22 Jan 2008 12:53:54 -0000 1.5464
@@ -1,5 +1,7 @@
2008-01-22 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/sprite_instance.cpp (sprite_swap_depth): ignore the call when
+ target and source characters have the same depth.
* server/asobj/SharedObject.cpp (sharedobject_getlocal): register the
static GcResource with the VM. Fixes bug #22039, but not the
correctness bugs as tested in the SharedObject.as case.
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -b -r1.455 -r1.456
--- server/sprite_instance.cpp 21 Jan 2008 20:55:52 -0000 1.455
+++ server/sprite_instance.cpp 22 Jan 2008 12:53:54 -0000 1.456
@@ -400,6 +400,22 @@
}
target_depth = target_sprite->get_depth();
+
+ // Check we're not swapping the our own depth so
+ // to avoid unecessary bounds invalidation and immunizing
+ // the instance from subsequent PlaceObjec tags attempting
+ // to transform it.
+ if ( sprite->get_depth() == target_depth )
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ stringstream ss; fn.dump_args(ss);
+ log_aserror(_("%s.swapDepths(%s): ignored, source and target characters
have the same depth %d"),
+ sprite->getTarget().c_str(),
+ ss.str().c_str(), target_depth);
+ );
+ return rv;
+ }
+
//target = boost::dynamic_pointer_cast<character>(target_sprite);
}
_______________________________________________
Gnash-commit mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-commit
