[Gnash-commit] gnash ChangeLog server/dlist.cpp

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/12/04 05:26:18

Modified files:
        .              : ChangeLog 
        server         : dlist.cpp 

Log message:
        * server/dlist.cpp: mergeDisplayList(), minor cleanups.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5074&r2=1.5075
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.106&r2=1.107

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5074
retrieving revision 1.5075
diff -u -b -r1.5074 -r1.5075
--- ChangeLog   4 Dec 2007 03:42:30 -0000       1.5074
+++ ChangeLog   4 Dec 2007 05:26:17 -0000       1.5075
@@ -4,6 +4,7 @@
          for mouse dragging, fix this should help fixing zoonmheng.swf.
        * testsuite/misc-ming.all/loop_test10.c: more tests for name synthesis,
          all passed.
+       * server/dlist.cpp: mergeDisplayList(), minor cleanups.
 
 2007-12-03 Benjamin Wolsey <address@hidden>
 

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- server/dlist.cpp    3 Dec 2007 07:18:19 -0000       1.106
+++ server/dlist.cpp    4 Dec 2007 05:26:18 -0000       1.107
@@ -1042,16 +1042,16 @@
 
        while( itOld != itOldEnd )
        {
-               iterator itOldBack = itOld;
+        iterator itOldBackup = itOld;
                
-               boost::intrusive_ptr<character> chOld = itOldBack->get();
+        boost::intrusive_ptr<character> chOld = itOldBackup->get();
                int depthOld = chOld->get_depth();
 
                while( itNew != itNewEnd )
                {
-                       iterator itNewBack = itNew;
+            iterator itNewBackup = itNew;
                        
-                       boost::intrusive_ptr<character> chNew = 
itNewBack->get();
+            boost::intrusive_ptr<character> chNew = itNewBackup->get();
                        int depthNew = chNew->get_depth();
                        
                        // unload the old character if it is not in the new list
@@ -1059,7 +1059,7 @@
                        {
                                itOld++;
 
-                               _charsByDepth.erase(itOldBack);
+                _charsByDepth.erase(itOldBackup);
 
                                if ( chOld->unload() )
                                {
@@ -1084,9 +1084,9 @@
                                
                                if( !is_ratio_compatible || chOld->isDynamic() 
|| !chOld->isActionScriptReferenceable() )
                                {
-                                       // replace the old character with the 
character in the new depth
-                                       _charsByDepth.insert(itOldBack, 
*itNewBack);
-                                       _charsByDepth.erase(itOldBack);
+                    // replace the character in old list with corresponding 
character in new list
+                    _charsByDepth.insert(itOldBackup, *itNewBackup);
+                    _charsByDepth.erase(itOldBackup);
                                        
                                        // unload the old character
                                        if ( chOld->unload() )
@@ -1100,16 +1100,14 @@
                                }
                                else
                                {
-                                       newList._charsByDepth.erase(itNewBack);
+                    newList._charsByDepth.erase(itNewBackup);
 
-                                       // replace the transformation matrix if 
the old character accepts transform
+                    // replace the transformation matrix if the old character 
accepts 
+                                       // static transformation.
                                        if( chOld->get_accept_anim_moves() )
                                        {
                                                
chOld->set_matrix(chNew->get_matrix());
                                                
chOld->set_cxform(chNew->get_cxform());
-                                               
-                                               // TODO: update the name if 
needed
-                                               
//chOld->set_name(chNew->get_name().c_str());
                                        }
                                        chNew->unload();
                                        chNew->destroy();
@@ -1117,12 +1115,12 @@
 
                                break;
                        }
-                       // add the new character if it is not in the old list
+            // add the character in new list if it is not in the old list
                        else 
                        {
                                itNew++;
 
-                               _charsByDepth.insert(itOldBack, *itNewBack );
+                _charsByDepth.insert(itOldBackup, *itNewBackup );
                        }
                }// end of while