[Gnash-commit] gnash ChangeLog server/fill_style.cpp server/mo...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/06 18:51:19

Modified files:
        .              : ChangeLog 
        server         : fill_style.cpp movie_root.cpp 

Log message:
        * server/fill_style.cpp: cast log arg to int, or boost::format will
          interpret as a character (string).
        * server/movie_root.cpp (markReachableResources): don't mark live
          chars as reachable, as they should be marked by their parent
          already (was a TODO item).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5828&r2=1.5829
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.163&r2=1.164

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5828
retrieving revision 1.5829
diff -u -b -r1.5828 -r1.5829
--- ChangeLog   6 Mar 2008 16:58:06 -0000       1.5828
+++ ChangeLog   6 Mar 2008 18:51:18 -0000       1.5829
@@ -1,5 +1,13 @@
 2008-03-06 Sandro Santilli <address@hidden>
 
+       * server/fill_style.cpp: cast log arg to int, or boost::format will
+         interpret as a character (string).
+       * server/movie_root.cpp (markReachableResources): don't mark live
+         chars as reachable, as they should be marked by their parent
+         already (was a TODO item).
+
+2008-03-06 Sandro Santilli <address@hidden>
+
        * libbase/GC.{cpp,h}: ok not calling size() twice, but
          don't properly update the last managed resources count..
 

Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/fill_style.cpp       29 Jan 2008 19:40:15 -0000      1.23
+++ server/fill_style.cpp       6 Mar 2008 18:51:18 -0000       1.24
@@ -339,7 +339,7 @@
                                "have position==%d (expected 0)."
                                " This seems to be common, so will"
                                " warn only once."),
-                               m_gradients[0].m_ratio);
+                               (int)m_gradients[0].m_ratio);
                        warned=true;
                        }
                );

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- server/movie_root.cpp       3 Mar 2008 11:12:25 -0000       1.163
+++ server/movie_root.cpp       6 Mar 2008 18:51:18 -0000       1.164
@@ -1579,20 +1579,10 @@
     // Mark character being dragged, if any
     m_drag_state.markReachableResources();
 
-    // TODO: we should theoretically NOT need to mark _liveChars here
-    //   as any element in this list should be NOT unloaded and
-    //   thus marked as reachable by it's parent or properly unloaded
-    //   and thus removed from this list by cleanupDisplayList.
-    //   Due to some bug I'm researching on, we'll mark them for now...
-    //   See http://savannah.gnu.org/bugs/index.php?21070
-    //
-    //log_debug("Marking %d live chars", _liveChars.size());
-    for (LiveChars::const_iterator i=_liveChars.begin(), e=_liveChars.end();
-            i != e; ++i)
-    {
-        (*i)->setReachable();
-    }
-    
+    // NOTE: we don't need to mark _liveChars as any elements in that list
+    //       should be NOT unloaded and thus marked as reachable by their
+    //       parent.
+    //std::for_each(_liveChars.begin(), _liveChars.end(), 
boost::bind(&character::setReachable, _1));
     
 }
 #endif // GNASH_USE_GC