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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/16 11:19:49

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        server/vm      : ASHandlers.cpp 

Log message:
                * server/sprite_instance.cpp (get_frame_number): check frame 
labels
                  also when convertion to number gives a non-integer value.
                * server/vm/ASHandlers.cpp (ActionGotoExpression): don't pretend
                  any path-looking string is necessarely a path, it can still be
                  a floating number or a frame label.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2886&r2=1.2887
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.243&r2=1.244
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.93&r2=1.94

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2886
retrieving revision 1.2887
diff -u -b -r1.2886 -r1.2887
--- ChangeLog   16 Apr 2007 10:26:59 -0000      1.2886
+++ ChangeLog   16 Apr 2007 11:19:48 -0000      1.2887
@@ -1,3 +1,11 @@
+2007-04-16 Sandro Santilli <address@hidden>
+
+       * server/sprite_instance.cpp (get_frame_number): check frame labels
+         also when convertion to number gives a non-integer value.
+       * server/vm/ASHandlers.cpp (ActionGotoExpression): don't pretend
+         any path-looking string is necessarely a path, it can still be
+         a floating number or a frame label.
+
 2007-04-16  John Gilmore  <address@hidden>
 
        * libbase/log.h: Update documentation for log_* functions; rename

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -b -r1.243 -r1.244
--- server/sprite_instance.cpp  16 Apr 2007 01:02:17 -0000      1.243
+++ server/sprite_instance.cpp  16 Apr 2007 11:19:48 -0000      1.244
@@ -1691,7 +1691,7 @@
 
        double num =  str.to_number(env);
 
-       if ( isnan(num) || isinf(num))
+       if ( ! isfinite(num) || int(num) != num )
        {
                return m_def->get_labeled_frame(frame_spec.to_std_string(env), 
frameno);
        }

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/vm/ASHandlers.cpp    16 Apr 2007 07:37:08 -0000      1.93
+++ server/vm/ASHandlers.cpp    16 Apr 2007 11:19:48 -0000      1.94
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.93 2007/04/16 07:37:08 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.94 2007/04/16 11:19:48 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2059,7 +2059,10 @@
        {
                target = env.find_target(target_path);
        }
-       else
+
+       if ( ! target ) // 4.11 would make parse_path above return true, 
+                       // we should check if a sprite named '4' is supposed to 
work
+                       // in that case 
        {
                target = env.get_target();
                frame_var = target_frame;