[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cp...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/07 17:24:40

Modified files:
        .              : ChangeLog 
        server/parser  : movie_def_impl.cpp movie_def_impl.h 
                         sprite_definition.cpp 

Log message:
                * server/parser/: movie_def_impl.{h,cpp}, sprite_definition.cpp
                  (add_frame_name): don't inline it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1883&r2=1.1884
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1883
retrieving revision 1.1884
diff -u -b -r1.1883 -r1.1884
--- ChangeLog   7 Dec 2006 17:22:51 -0000       1.1883
+++ ChangeLog   7 Dec 2006 17:24:40 -0000       1.1884
@@ -1,5 +1,7 @@
 2006-12-07 Sandro Santilli <address@hidden>
 
+       * server/parser/: movie_def_impl.{h,cpp}, sprite_definition.cpp
+         (add_frame_name): don't inline it.
        * server/vm/action.cpp (attach_extern_movie): 
          store sprites in intrusive pointers (fixes some
          testInvariant failures).

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/parser/movie_def_impl.cpp    6 Dec 2006 10:21:32 -0000       1.54
+++ server/parser/movie_def_impl.cpp    7 Dec 2006 17:24:40 -0000       1.55
@@ -1045,6 +1045,20 @@
        return res;
 }
 
+void
+movie_def_impl::add_frame_name(const char* name)
+{
+       //log_msg("labelframe: frame %d, name %s", _frames_loaded, name);
+       assert(_frames_loaded < m_frame_count);
+
+    tu_string  n = name;
+
+               if (m_named_frames.get(n, NULL) == false)       // frame should 
not already have a name (?)
+               {
+           m_named_frames.add(n, _frames_loaded);      // stores 0-based frame 
#
+               }
+}
+
 
 } // namespace gnash
 

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/movie_def_impl.h      6 Dec 2006 10:21:32 -0000       1.27
+++ server/parser/movie_def_impl.h      7 Dec 2006 17:24:40 -0000       1.28
@@ -469,17 +469,7 @@
        }
 
        // See dox in movie_definition.h
-       void    add_frame_name(const char* name)
-       {
-           assert(_frames_loaded < m_frame_count);
-
-           tu_string   n = name;
-
-                       if (m_named_frames.get(n, NULL) == false)       // 
frame should not already have a name (?)
-                       {
-                   m_named_frames.add(n, _frames_loaded);      // stores 
0-based frame #
-                       }
-       }
+       void add_frame_name(const char* name);
 
        /// Set an input object for later loading DefineBits
        /// images (JPEG images without the table info).

Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/parser/sprite_definition.cpp 28 Nov 2006 12:30:43 -0000      1.6
+++ server/parser/sprite_definition.cpp 7 Dec 2006 17:24:40 -0000       1.7
@@ -155,6 +155,7 @@
 void
 sprite_definition::add_frame_name(const char* name)
 {
+       //log_msg("labelframe: frame %d, name %s", m_loading_frame, name);
        assert((int)m_loading_frame >= 0 && m_loading_frame < m_frame_count);
 
        tu_string n = name;