[Gnash-commit] gnash ChangeLog server/swf/tag_loaders.h server...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/14 21:58:55

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

Log message:
                * server/swf/tag_loaders.h, server/swf/tag_loaders.cpp:
                  allow define_font_info_loader to be called for DEFINEFONTINFO2
                  tag, updated doc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.643&r2=1.644
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -b -r1.643 -r1.644
--- ChangeLog   14 Aug 2006 20:26:16 -0000      1.643
+++ ChangeLog   14 Aug 2006 21:58:54 -0000      1.644
@@ -1,5 +1,8 @@
 2006-08-14 Sandro Santilli  <address@hidden>
 
+       * server/swf/tag_loaders.h, server/swf/tag_loaders.cpp:
+         allow define_font_info_loader to be called for DEFINEFONTINFO2
+         tag, updated doc.
        * libbase/container.cpp: removed extra ';'
        * server/font.cpp, server/font.h, server/impl.cpp, server/swf.h:
          initial support for DefineFontInfo2 tag, stricter use of

Index: server/swf/tag_loaders.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/swf/tag_loaders.h    3 Aug 2006 19:16:38 -0000       1.6
+++ server/swf/tag_loaders.h    14 Aug 2006 21:58:54 -0000      1.7
@@ -89,10 +89,10 @@
 
 void   define_font_loader(stream*, tag_type, movie_definition*);
 
-/// SWF Tag DefineFontInfo (13) 
+/// SWF Tag DefineFontInfo (13 or 62) 
 //
-/// Load a DefineFontInfo tag.  This adds information to an
-/// existing font.
+/// Load a DefineFontInfo or DefineFontInfo2 tag. 
+/// This adds information to an existing font.
 ///
 void   define_font_info_loader(stream*, tag_type, movie_definition*);
 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/swf/tag_loaders.cpp  13 Aug 2006 16:45:11 -0000      1.24
+++ server/swf/tag_loaders.cpp  14 Aug 2006 21:58:54 -0000      1.25
@@ -197,7 +197,7 @@
 
 #if TU_CONFIG_LINK_TO_JPEGLIB
     jpeg::input*       j_in = 
jpeg::input::create_swf_jpeg2_header_only(in->get_underlying_stream());
-    assert(j_in);
+    assert(j_in.get());
 
     m->set_jpeg_loader(j_in);
 #endif // TU_CONFIG_LINK_TO_JPEGLIB
@@ -729,25 +729,26 @@
 }
 
 
-/// SWF Tag DefineFontInfo (13) 
+/// SWF Tag DefineFontInfo and DefineFontInfo2 (13 or 62) 
 //
-/// Load a DefineFontInfo tag.  This adds information to an
-/// existing font.
+/// Load a DefineFontInfo or DefineFontInfo2 tag. 
+/// This adds information to an existing font.
 ///
 void   define_font_info_loader(stream* in, tag_type tag, movie_definition* m)
 {
-    assert(tag == SWF::DEFINEFONTINFO); // 13
+       assert(tag == SWF::DEFINEFONTINFO || tag == SWF::DEFINEFONTINFO2); 
 
     uint16_t   font_id = in->read_u16();
                
     font*      f = m->get_font(font_id);
     if (f)
        {
-           f->read_font_info(in);
+               f->read_font_info(in, tag, m);
        }
     else
        {
-           log_error("define_font_info_loader: can't find font w/ id %d\n", 
font_id);
+               log_error("define_font_info_loader: "
+                       "can't find font w/ id %d", font_id);
        }
 }