[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/06 09:06:28

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        server/parser  : movie_def_impl.h movie_definition.h 
        testsuite/swfdec: PASSING 

Log message:
                * server/sprite_instance.cpp (sprite_attach_movie): remove 
useless
                  std::string construction.
                * server/parser/movie_def_impl.h: change ExportMap to use
                  case-insensitive string comparison.
                * server/parser/movie_definition.h: update get_exported_resource
                  documentation to mention string matching is always 
case-insensitive.
                * testsuite/swfdec/PASSING: export-case-# success.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4553&r2=1.4554
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.367&r2=1.368
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4553
retrieving revision 1.4554
diff -u -b -r1.4553 -r1.4554
--- ChangeLog   6 Oct 2007 08:20:05 -0000       1.4553
+++ ChangeLog   6 Oct 2007 09:06:27 -0000       1.4554
@@ -1,5 +1,15 @@
 2007-10-06 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (sprite_attach_movie): remove useless
+         std::string construction.
+       * server/parser/movie_def_impl.h: change ExportMap to use
+         case-insensitive string comparison.
+       * server/parser/movie_definition.h: update get_exported_resource
+         documentation to mention string matching is always case-insensitive.
+       * testsuite/swfdec/PASSING: export-case-# success.
+
+2007-10-06 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/Number.as: test conversion of a string
          with a decimal point to a number (fails when locales have comma
          instead of dot as the decimal point). See bug #21168.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -b -r1.367 -r1.368
--- server/sprite_instance.cpp  5 Oct 2007 14:19:55 -0000       1.367
+++ server/sprite_instance.cpp  6 Oct 2007 09:06:27 -0000       1.368
@@ -165,7 +165,7 @@
        // Get exported resource 
        const std::string& id_name = fn.arg(0).to_string(&fn.env());
 
-       boost::intrusive_ptr<resource> exported = 
sprite->get_movie_definition()->get_exported_resource(id_name.c_str());
+       boost::intrusive_ptr<resource> exported = 
sprite->get_movie_definition()->get_exported_resource(id_name);
        if ( exported == NULL )
        {
                IF_VERBOSE_ASCODING_ERRORS(

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/parser/movie_def_impl.h      19 Sep 2007 23:24:45 -0000      1.55
+++ server/parser/movie_def_impl.h      6 Oct 2007 09:06:28 -0000       1.56
@@ -33,6 +33,7 @@
 #include "resource.h" // for boost::intrusive_ptr visibility of dtor
 #include "stream.h" // for get_bytes_loaded
 #include "Timeline.h" // for composition 
+#include "StringPredicates.h" // for case-insensitive string comparision 
(ExportMap)
 
 #include <map> // for CharacterDictionary
 #include <string>
@@ -225,7 +226,7 @@
        // Mutex protecting access to _namedFrames
        mutable boost::mutex _namedFramesMutex;
 
-       typedef std::map<std::string, boost::intrusive_ptr<resource> > 
ExportMap;
+       typedef std::map<std::string, boost::intrusive_ptr<resource>, 
StringNoCaseLessThen > ExportMap;
        ExportMap m_exports;
 
        /// Items we import.

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/parser/movie_definition.h    17 Sep 2007 23:33:18 -0000      1.31
+++ server/parser/movie_definition.h    6 Oct 2007 09:06:28 -0000       1.32
@@ -255,6 +255,9 @@
 
        /// Get the named exported resource, if we expose it.
        //
+       /// @param symbol
+       ///     The symbol name. Matching should be case-insensitive for all 
SWF versions.
+       ///
        /// @return NULL if the label doesn't correspond to an exported
        ///         resource. This is the default behaviour.
        ///

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- testsuite/swfdec/PASSING    6 Oct 2007 08:17:48 -0000       1.37
+++ testsuite/swfdec/PASSING    6 Oct 2007 09:06:28 -0000       1.38
@@ -268,3 +268,6 @@
 definefunction2-registers-6.swf
 definefunction2-registers-7.swf
 definefunction2-registers-8.swf
+export-case-5.swf
+export-case-6.swf
+export-case-7.swf