[Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/tag_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/26 22:58:39

Modified files:
        .              : ChangeLog 
        server         : impl.cpp 
        server/swf     : tag_loaders.cpp tag_loaders.h 

Log message:
                * server/impl.cpp, server/swf/tag_loaders.{cpp,h}:
                  Add support for IMPORTASSETS2 (an SWF8 tag).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2478&r2=1.2479
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.h?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2478
retrieving revision 1.2479
diff -u -b -r1.2478 -r1.2479
--- ChangeLog   26 Feb 2007 22:20:24 -0000      1.2478
+++ ChangeLog   26 Feb 2007 22:58:38 -0000      1.2479
@@ -1,5 +1,10 @@
 2007-02-26 Sandro Santilli <address@hidden>
 
+       * server/impl.cpp, server/swf/tag_loaders.{cpp,h}:
+         Add support for IMPORTASSETS2 (an SWF8 tag).
+
+2007-02-26 Sandro Santilli <address@hidden>
+
        * server/parser/sprite_definition.h: don't check 
          for movie definition being NULL as we're not allowing
          this anymore.

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- server/impl.cpp     23 Feb 2007 11:26:54 -0000      1.97
+++ server/impl.cpp     26 Feb 2007 22:58:38 -0000      1.98
@@ -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: impl.cpp,v 1.97 2007/02/23 11:26:54 strk Exp $ */
+/* $Id: impl.cpp,v 1.98 2007/02/26 22:58:38 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -217,7 +217,7 @@
        
        register_tag_loader(SWF::FILEATTRIBUTES, file_attributes_loader); // 69
        register_tag_loader(SWF::PLACEOBJECT3, fixme_loader); // 70
-       register_tag_loader(SWF::IMPORTASSETS2, fixme_loader); // 71
+       register_tag_loader(SWF::IMPORTASSETS2, import_loader); // 71
 
        register_tag_loader(SWF::DEFINEALIGNZONES, 
DefineFontAlignZonesTag::loader); // 73
 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- server/swf/tag_loaders.cpp  21 Feb 2007 11:35:51 -0000      1.76
+++ server/swf/tag_loaders.cpp  26 Feb 2007 22:58:38 -0000      1.77
@@ -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: tag_loaders.cpp,v 1.76 2007/02/21 11:35:51 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.77 2007/02/26 22:58:38 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1392,19 +1392,31 @@
 
 void   import_loader(stream* in, tag_type tag, movie_definition* m)
 {
-    assert(tag == SWF::IMPORTASSETS);
+       assert(tag == SWF::IMPORTASSETS || tag == SWF::IMPORTASSETS2);
 
     char*      source_url = in->read_string();
-    int        count = in->read_u16();
 
     // Resolve relative urls against baseurl
     URL abs_url(source_url, get_base_url());
 
+       unsigned char import_version = 0;
+
+       if ( tag == SWF::IMPORTASSETS2 )
+       {
+               import_version = in->read_uint(8);
+               unsigned char reserved = in->read_uint(8);
+               UNUSED(reserved);
+       }
+
+       int     count = in->read_u16();
+
                IF_VERBOSE_PARSE
                (
-    log_parse("  import: source_url = %s (%s), count = %d", 
abs_url.str().c_str(), source_url, count);
+       log_parse("  import: version = %u, source_url = %s (%s), count = %d", 
import_version, abs_url.str().c_str(), source_url, count);
+       //log_parse("  import: version = %u, source_url = %s (%s), count = %d", 
import_version, abs_url.str().c_str(), source_url, count);
                );
 
+
     // Try to load the source movie into the movie library.
     movie_definition*  source_movie = NULL;
 
@@ -1442,7 +1454,7 @@
                IF_VERBOSE_PARSE
                (
            log_parse("  import: id = %d, name = %s", id, symbol_name);
-               )
+               );
            
            if (s_no_recurse_while_loading)
                {

Index: server/swf/tag_loaders.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/swf/tag_loaders.h    21 Feb 2007 11:35:51 -0000      1.15
+++ server/swf/tag_loaders.h    26 Feb 2007 22:58:38 -0000      1.16
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: tag_loaders.h,v 1.15 2007/02/21 11:35:51 strk Exp $ */
+/* $Id: tag_loaders.h,v 1.16 2007/02/26 22:58:38 strk Exp $ */
 
 #ifndef GNASH_SWF_TAG_LOADERS_H
 #define GNASH_SWF_TAG_LOADERS_H
@@ -113,7 +113,7 @@
 
 void   export_loader(stream*, tag_type, movie_definition*);
 
-/// Load an SWF::IMPORTASSETS tag (for pulling in external resources)
+/// Load an SWF::IMPORTASSETS or SWF::IMPORTASSETS2 tag (for pulling in 
external resources)
 void   import_loader(stream*, tag_type, movie_definition*);
 
 /// Load a SWF::DEFINESOUND tag.