[Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/26 14:19:23

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

Log message:
                * server/vm/ASHandlers.cpp (ActionGotoExpression:
                  Frame are 1-based when referred to by Flash coders.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2472&r2=1.2473
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2472
retrieving revision 1.2473
diff -u -b -r1.2472 -r1.2473
--- ChangeLog   26 Feb 2007 13:55:11 -0000      1.2472
+++ ChangeLog   26 Feb 2007 14:19:23 -0000      1.2473
@@ -1,5 +1,7 @@
 2007-02-26 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (ActionGotoExpression:
+         Frame are 1-based when referred to by Flash coders.
        * testsuite/samples/Makefile.am: 
          Enabled run of GotoAndPlayTest.swf self-contained
          testcase.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/vm/ASHandlers.cpp    21 Feb 2007 20:22:59 -0000      1.39
+++ server/vm/ASHandlers.cpp    26 Feb 2007 14:19:23 -0000      1.40
@@ -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.39 2007/02/21 20:22:59 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.40 2007/02/26 14:19:23 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2040,14 +2040,18 @@
                                target->goto_frame(frame_number);
                                success = true;
                        }
+                       else
+                       {
+                               log_error("ActionGotoExpression: conversion of 
string '%s' to a number failed", frame_label);
+                       }
                        // else no-op.
                }
        }
        else if ( expression.is_number() )
        {
-               // Frame numbers appear to be 0-based!  @@ Verify.
+               // Frame number is 1-based !
                int frame_number = int(expression.to_number());
-               target->goto_frame(frame_number);
+               target->goto_frame(frame_number-1);
                success = true;
        }
 //     else
@@ -2066,6 +2070,10 @@
        {
                target->set_play_state(state);
        }
+       else
+       {
+               log_error("No success in gotoFrame2 ? should this ever happen 
?");
+       }
                  
        env.drop(1);
 }