[Gnash-commit] gnash ChangeLog server/text.cpp server/parser/t...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/08 07:28:21

Modified files:
        .              : ChangeLog 
        server         : text.cpp 
        server/parser  : text_character_def.cpp 

Log message:
                * server/text.cpp, server/parser/text_character_def.cpp:
                  resolve style fonts at parse time (not use time) - reduce     
                  number of warnings given.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1551&r2=1.1552
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1551
retrieving revision 1.1552
diff -u -b -r1.1551 -r1.1552
--- ChangeLog   8 Nov 2006 03:19:51 -0000       1.1551
+++ ChangeLog   8 Nov 2006 07:28:20 -0000       1.1552
@@ -1,5 +1,8 @@
 2006-11-08 Sandro Santilli <address@hidden>
 
+       * server/text.cpp, server/parser/text_character_def.cpp:
+         resolve style fonts at parse time (not use time) - reduce
+         number of warnings given.
        * backend/render_handler_ogl.cpp: revert last commit, which
          made this a binary file !!!
        * gui/Makefile.am, utilities/Makefile.am: don't list

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/text.cpp     10 Oct 2006 09:55:29 -0000      1.26
+++ server/text.cpp     8 Nov 2006 07:28:20 -0000       1.27
@@ -31,7 +31,10 @@
                        m_font = root_def->get_font(m_font_id);
                        if (m_font == NULL)
                        {
-                               log_error("error: text style with undefined 
font; font_id = %d\n", m_font_id);
+                               IF_VERBOSE_MALFORMED_SWF(
+       log_warning("text style references unknown font (id = %d)\n",
+               m_font_id);
+                               );
                        }
                }
        }
@@ -83,7 +86,7 @@
                        // chars that share a particular style.
                        const text_glyph_record&        rec = records[i];
 
-                       rec.m_style.resolve_font(root_def);
+                       //rec.m_style.resolve_font(root_def);
 
                        const font*     fnt = rec.m_style.m_font;
                        if (fnt == NULL)

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/parser/text_character_def.cpp        24 Aug 2006 16:59:07 -0000      
1.1
+++ server/parser/text_character_def.cpp        8 Nov 2006 07:28:21 -0000       
1.2
@@ -75,6 +75,7 @@
                        {
                                uint16_t        font_id = in->read_u16();
                                style.m_font_id = font_id;
+                               style.resolve_font(m);
                                IF_VERBOSE_PARSE(
                                log_parse("  has_font: font id = %d", font_id);
                                );