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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/12 13:17:55

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

Log message:
        * server/parser/edit_text_character_def.cpp: fix regression making
          dynamically created text not find any font (we'll use the default
          one instead).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6912&r2=1.6913
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6912
retrieving revision 1.6913
diff -u -b -r1.6912 -r1.6913
--- ChangeLog   12 Jun 2008 12:44:57 -0000      1.6912
+++ ChangeLog   12 Jun 2008 13:17:54 -0000      1.6913
@@ -1,3 +1,9 @@
+2008-06-12 Sandro Santilli <address@hidden>
+
+       * server/parser/edit_text_character_def.cpp: fix regression making
+         dynamically created text not find any font (we'll use the default
+         one instead).
+
 2008-06-12 Benjamin Wolsey <address@hidden>
 
        * server/vm/ActionExec.{h,cpp}: fix throw in register again (prevents

Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/parser/edit_text_character_def.cpp   10 Jun 2008 10:30:54 -0000      
1.24
+++ server/parser/edit_text_character_def.cpp   12 Jun 2008 13:17:55 -0000      
1.25
@@ -78,13 +78,13 @@
        if (has_font)
        {
                in->ensureBytes(4);
-               int fontID = in->read_u16();
-               m_font = m->get_font(fontID);
+               m_font_id = in->read_u16();
+               m_font = m->get_font(m_font_id);
                if (m_font == NULL)
                {
-                       // this is fine, the textfield would use a default 
device font
-                       //log_debug(_("text style with undefined font; font_id 
= %d; using a default font"), m_font_id);
-                       m_font = fontlib::get_default_font().get();
+                       IF_VERBOSE_MALFORMED_SWF(
+                       log_swferror("DefineEditText: tag refers to unknown 
font id %d", m_font_id);
+                       );
                }
                m_text_height = in->read_u16();
        }
@@ -140,6 +140,10 @@
 const font*
 edit_text_character_def::get_font()
 {
+       if ( ! m_font )
+       {
+               m_font = fontlib::get_default_font().get();
+       }
        return m_font.get();
 }