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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/10 10:30:55

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

Log message:
        (read): handle hasFontClass (log_unimpl, and some log_swferror).

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6885
retrieving revision 1.6886
diff -u -b -r1.6885 -r1.6886
--- ChangeLog   10 Jun 2008 09:10:17 -0000      1.6885
+++ ChangeLog   10 Jun 2008 10:30:54 -0000      1.6886
@@ -1,3 +1,8 @@
+2008-06-10 Sandro Santilli <address@hidden>
+
+       * server/parser/edit_text_character.cpp (read): handle hasFontClass
+         (log_unimpl, and some log_swferror).
+
 2008-06-10 Zou Lunkai <address@hidden>
        
        * server/matrix.h: drop matrix::concatenate_scale(float s), not used 
any more.

Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/parser/edit_text_character_def.cpp   9 Jun 2008 10:18:24 -0000       
1.23
+++ server/parser/edit_text_character_def.cpp   10 Jun 2008 10:30:54 -0000      
1.24
@@ -57,12 +57,21 @@
        bool  has_font       = flags & (1 << 0); 
 
     flags = in->read_u8();
-    // reserved_bit  = flags & (1 << 7);
+       // 0: no font class, 1 font class and height, can't be true if has_font 
was true
+       bool hasFontClass = flags & (1 << 7);
+       if ( hasFontClass && has_font )
+       {
+               IF_VERBOSE_MALFORMED_SWF(
+               log_swferror("DefineEditText: hasFontClass can't be true if 
hasFont is true, ignoring");
+               );
+               hasFontClass=false;
+       }
        m_auto_size      = flags & (1 << 6); 
        bool  has_layout = flags & (1 << 5); 
        m_no_select      = flags & (1 << 4); 
        m_border         = flags & (1 << 3); 
-       // reserved_bit  = flags & (1 << 2);
+       bool wasStatic   = flags & (1 << 2); // authored as static text (not 
dynamic text)
+       UNUSED(wasStatic);
        m_html           = flags & (1 << 1); 
        m_use_outlines   = flags & (1 << 0); 
 
@@ -79,6 +88,13 @@
                }
                m_text_height = in->read_u16();
        }
+       else if ( hasFontClass )
+       {
+               std::string fontClassName;
+               in->read_string(fontClassName);
+               log_unimpl("Font class support for DefineEditText (%d)", 
fontClassName);
+       }
+       
 
        if (has_color)
        {