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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/31 11:06:09

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp (goto_frame): fix
                  check for target frame being already loaded.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2204&r2=1.2205
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.141&r2=1.142

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2204
retrieving revision 1.2205
diff -u -b -r1.2204 -r1.2205
--- ChangeLog   31 Jan 2007 09:28:43 -0000      1.2204
+++ ChangeLog   31 Jan 2007 11:06:09 -0000      1.2205
@@ -1,5 +1,7 @@
 2007-01-31 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (goto_frame): fix
+         check for target frame being already loaded.
        * server/button_character_instance.cpp (on_event):
          added verbose output for unsupported button events.
        * testsuite/misc-ming.all/: ButtonEventTest.c,

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- server/sprite_instance.cpp  30 Jan 2007 18:29:40 -0000      1.141
+++ server/sprite_instance.cpp  31 Jan 2007 11:06:09 -0000      1.142
@@ -2665,18 +2665,22 @@
        }
 
        size_t loaded_frames = get_loaded_frames();
-       if ( target_frame_number > loaded_frames )
+       // target_frame_number is 0-based, get_loaded_frames() is 1-based
+       // so in order to goto_frame(3) loaded_frames must be at least 4
+       // if goto_frame(4) is called, and loaded_frames is 4 we're jumping
+       // forward
+       if ( target_frame_number >= loaded_frames )
        {
                IF_VERBOSE_ASCODING_ERRORS(
                        log_aserror("GotoFrame(" SIZET_FMT ") targets a yet "
                                "to be loaded frame (" SIZET_FMT ") loaded).\n"
                                "We'll wait for it but a more correct form "
                                "is explicitly using WaitForFrame instead.",
-                               target_frame_number,
+                               target_frame_number+1,
                                loaded_frames);
 
                );
-               m_def->ensure_frame_loaded(target_frame_number);
+               m_def->ensure_frame_loaded(target_frame_number+1);
        }
        
        m_current_frame = target_frame_number;