[Gnash-commit] gnash ChangeLog server/movie_root.cpp server/as...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/03 21:44:32

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp 
        server/asobj   : Stage.cpp 

Log message:
                * server/movie_root.cpp (getStage): properly convert case when
                  fetching the "Stage" object from SWF6 or lower.
                * server/asobj/Stage.cpp (onResize): properly convert case
                  when fetching the "scaleMode" property from SWF6 or lower.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3941&r2=1.3942
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3941
retrieving revision 1.3942
diff -u -b -r1.3941 -r1.3942
--- ChangeLog   3 Aug 2007 21:26:11 -0000       1.3941
+++ ChangeLog   3 Aug 2007 21:44:31 -0000       1.3942
@@ -1,5 +1,12 @@
 2007-08-03 Sandro Santilli <address@hidden>
 
+       * server/movie_root.cpp (getStage): properly convert case when
+         fetching the "Stage" object from SWF6 or lower.
+       * server/asobj/Stage.cpp (onResize): properly convert case
+         when fetching the "scaleMode" property from SWF6 or lower.
+
+2007-08-03 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/Stage.as: test deleting an object
          which is also a listener (Gnash segfaults).
 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/movie_root.cpp       2 Aug 2007 22:07:25 -0000       1.81
+++ server/movie_root.cpp       3 Aug 2007 21:44:32 -0000       1.82
@@ -198,7 +198,7 @@
        if ( ! VM::isInitialized() ) return NULL;
        as_object* global = VM::get().getGlobal();
        if ( ! global ) return NULL;
-       if ( ! global->get_member("Stage", &v) ) return NULL;
+       if ( ! global->get_member(PROPNAME("Stage"), &v) ) return NULL;
        return boost::dynamic_pointer_cast<Stage>(v.to_object());
 }
                

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/Stage.cpp      1 Jul 2007 10:54:31 -0000       1.16
+++ server/asobj/Stage.cpp      3 Aug 2007 21:44:32 -0000       1.17
@@ -30,6 +30,7 @@
 #include "VM.h"
 
 #include <string>
+#include <boost/algorithm/string/case_conv.hpp> // for using PROPNAME
 
 namespace gnash {
 
@@ -68,7 +69,7 @@
 Stage::onResize(as_environment* env)
 {
        as_value v;
-       if ( get_member("scaleMode", &v) && v.to_string(env) == "noScale" )
+       if ( get_member(PROPNAME("scaleMode"), &v) && v.to_string(env) == 
"noScale" )
        {
                notifyResize(env);
        }