[Gnash-commit] gnash ChangeLog server/parser/sprite_definition...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/20 16:54:00

Modified files:
        .              : ChangeLog 
        server/parser  : sprite_definition.cpp 

Log message:
                  If DefineSprite contains less SHOWFRAME then advertised
                  in header, still pretend all of the advertised frames
                  were loaded. This should be safe, and makes FlowPlayer
                  progress further (it exports an asset that advertise
                  1 frame and contains NO showframe tag).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5985&r2=1.5986
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5985
retrieving revision 1.5986
diff -u -b -r1.5985 -r1.5986
--- ChangeLog   20 Mar 2008 12:31:53 -0000      1.5985
+++ ChangeLog   20 Mar 2008 16:53:59 -0000      1.5986
@@ -1,5 +1,14 @@
 2008-03-20 Sandro Santilli <address@hidden>
 
+       * server/parser/sprite_definition.cpp (read):
+         If DefineSprite contains less SHOWFRAME then advertised
+         in header, still pretend all of the advertised frames
+         were loaded. This should be safe, and makes FlowPlayer
+         progress further (it exports an asset that advertise
+         1 frame and contains NO showframe tag).
+
+2008-03-20 Sandro Santilli <address@hidden>
+
        * server/character.{cpp,h}: add a virtual getMovieInfo.
        * server/movie_root.{cpp,h}: delegate character info gathering
          to the characters themselves. 

Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/parser/sprite_definition.cpp 3 Mar 2008 17:45:01 -0000       1.28
+++ server/parser/sprite_definition.cpp 20 Mar 2008 16:54:00 -0000      1.29
@@ -151,6 +151,18 @@
                in->close_tag();
        }
 
+        if ( m_frame_count > m_loading_frame )
+        {
+               IF_VERBOSE_MALFORMED_SWF(
+               log_swferror(_(SIZET_FMT " frames advertised in header, but 
only " SIZET_FMT " SHOWFRAME tags "
+                       "found in define sprite."), m_frame_count, 
m_loading_frame);
+               );
+
+               // this should be safe 
+               m_loading_frame = m_frame_count;
+        }
+
+
                IF_VERBOSE_PARSE (
        log_parse(_("  -- sprite END --"));
                );