[Gnash-commit] gnash ChangeLog server/asobj/MovieClipLoader.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/05 22:37:02

Modified files:
        .              : ChangeLog 
        server/asobj   : MovieClipLoader.cpp 

Log message:
                * server/asobj/MovieClipLoader.cpp (loadClip): use smart
                  pointers (to avoid testInvariant failures in sprite_instance).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1860&r2=1.1861
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1860
retrieving revision 1.1861
diff -u -b -r1.1860 -r1.1861
--- ChangeLog   5 Dec 2006 22:10:57 -0000       1.1860
+++ ChangeLog   5 Dec 2006 22:37:01 -0000       1.1861
@@ -1,5 +1,7 @@
 2006-12-05 Sandro Santilli <address@hidden>
 
+       * server/asobj/MovieClipLoader.cpp (loadClip): use smart
+         pointers (to avoid testInvariant failures in sprite_instance).
        * server/types.{cpp,h} (rgba::print): made a const method.
        * .cvsignore, extensions/.cvsignore, plugin/klash/.cvsignore,
          testsuite/libgeometry/.cvsignore, utilities/.cvsignore,

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/MovieClipLoader.cpp    24 Nov 2006 09:04:24 -0000      1.12
+++ server/asobj/MovieClipLoader.cpp    5 Dec 2006 22:37:02 -0000       1.13
@@ -191,7 +191,7 @@
        //       the loading thread actually started
        dispatchEvent("onLoadStart", events_call);
 
-       movie_definition* md = create_library_movie(url);
+       boost::intrusive_ptr<movie_definition> md ( create_library_movie(url) );
        if (md == NULL)
        {
                log_error("can't create movie_definition for %s\n",
@@ -199,7 +199,7 @@
                return false;
        }
 
-       gnash::sprite_instance* extern_movie;
+       boost::intrusive_ptr<sprite_instance> extern_movie;
        extern_movie = md->create_instance();
        if (extern_movie == NULL)
        {
@@ -221,7 +221,7 @@
        dispatchEvent("onLoadInit", events_call);
   
 
-       save_extern_movie(extern_movie);
+       save_extern_movie(extern_movie.get());
 
        const char* name = target.get_name().c_str();
        uint16_t depth = target.get_depth();