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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/30 15:17:16

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

Log message:
                * server/parser/movie_def_impl.cpp (resolve_import):
                  remove unneeded round-trip with static casts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1829&r2=1.1830
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1829
retrieving revision 1.1830
diff -u -b -r1.1829 -r1.1830
--- ChangeLog   30 Nov 2006 13:41:51 -0000      1.1829
+++ ChangeLog   30 Nov 2006 15:17:16 -0000      1.1830
@@ -1,5 +1,7 @@
 2006-11-30 Sandro Santilli <address@hidden>
 
+       * server/parser/movie_def_impl.cpp (resolve_import):
+         remove unneeded round-trip with static casts.
        * server/edit_text_character.{h,cpp},
          server/parser/edit_text_character_def.h:
          use unsigned integers for curosr and max text length.

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/parser/movie_def_impl.cpp    30 Nov 2006 13:32:45 -0000      1.51
+++ server/parser/movie_def_impl.cpp    30 Nov 2006 15:17:16 -0000      1.52
@@ -281,11 +281,6 @@
 
 void movie_def_impl::resolve_import(const char* source_url, movie_definition* 
source_movie)
 {
-    // @@ should be safe, but how can we verify
-    // it?  Compare a member function pointer, or
-    // something?
-    movie_def_impl*    def_impl = static_cast<movie_def_impl*>(source_movie);
-    movie_definition*  def = static_cast<movie_definition*>(def_impl);
 
     // Iterate in reverse, since we remove stuff along the way.
     for (size_t i = m_imports.size(); i > 0; i--)
@@ -294,8 +289,8 @@
             if (inf.m_source_url == source_url)
                 {
                     // Do the import.
-                    boost::intrusive_ptr<resource> res = 
def->get_exported_resource(inf.m_symbol);
-                    bool        imported = true;
+                    boost::intrusive_ptr<resource> res = 
source_movie->get_exported_resource(inf.m_symbol);
+                    bool        imported = false;
 
                     if (res == NULL)
                         {
@@ -322,6 +317,7 @@
 
                     if (imported)
                         {
+                               // TODO: a std::list would be faster here
                             m_imports.erase(m_imports.begin() + i);
 
                             // Hold a ref, to keep this source 
movie_definition alive.