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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  08/05/16 07:22:36

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

Log message:
        server/parser/button_character_def.cpp,
        server/parser/edit_text_character_def.cpp: use read_u8() instead of 
read_bit(), parser optimize.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6614&r2=1.6615
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6614
retrieving revision 1.6615
diff -u -b -r1.6614 -r1.6615
--- ChangeLog   16 May 2008 07:18:45 -0000      1.6614
+++ ChangeLog   16 May 2008 07:22:31 -0000      1.6615
@@ -2,6 +2,9 @@
        
        * server/cxform.cpp: use read_u8() instead of read_bit(), parser 
optimize.
        * server/font.cpp: use read_u8() instead of read_bit(), parser optimize.
+       * server/parser/button_character_def.cpp,
+         server/parser/edit_text_character_def.cpp: use read_u8() instead of 
read_bit(), 
+         parser optimize.
        
 2008-05-16 Benjamin Wolsey <address@hidden>
 

Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/parser/button_character_def.cpp      21 Apr 2008 16:39:16 -0000      
1.34
+++ server/parser/button_character_def.cpp      16 May 2008 07:22:33 -0000      
1.35
@@ -248,13 +248,16 @@
 {
        in->ensureBytes(1);
        m_in_point = m_out_point = m_loop_count = 0;
-       in->read_uint(2);       // skip reserved bits.
-       m_stop_playback = in->read_bit(); 
-       m_no_multiple = in->read_bit(); 
-       m_has_envelope = in->read_bit();
-       m_has_loops = in->read_bit(); 
-       m_has_out_point = in->read_bit();
-       m_has_in_point = in->read_bit(); 
+    
+    // highest 2 bits are reserved(unused).
+    int flags = in->read_u8();
+       m_stop_playback = flags & (1 << 5); 
+       m_no_multiple   = flags & (1 << 4); 
+       m_has_envelope  = flags & (1 << 3); 
+       m_has_loops     = flags & (1 << 2);  
+       m_has_out_point = flags & (1 << 1); 
+       m_has_in_point  = flags & (1 << 0);  
+    
        if (m_has_in_point)
        {
                in->ensureBytes(4);

Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/parser/edit_text_character_def.cpp   21 Apr 2008 11:27:45 -0000      
1.20
+++ server/parser/edit_text_character_def.cpp   16 May 2008 07:22:35 -0000      
1.21
@@ -44,25 +44,27 @@
        m_rect.read(in);
 
        in->align();
-       in->ensureBytes(1);
-       m_has_text = in->read_bit();
-       m_word_wrap = in->read_bit();
-       m_multiline = in->read_bit();
-       m_password = in->read_bit();
-       m_readonly = in->read_bit(); 
-       bool    has_color = in->read_bit(); 
-       bool    has_max_length = in->read_bit(); 
-       bool    has_font = in->read_bit(); 
-
-       in->ensureBytes(1);
-       in->read_bit(); // reserved
-       m_auto_size = in->read_bit(); 
-       bool    has_layout = in->read_bit(); 
-       m_no_select = in->read_bit(); 
-       m_border = in->read_bit(); 
-       in->read_bit(); // reserved
-       m_html = in->read_bit(); 
-       m_use_outlines = in->read_bit(); 
+       in->ensureBytes(2);
+    
+    int flags = in->read_u8();
+       m_has_text  = flags & (1 << 7);
+       m_word_wrap = flags & (1 << 6);
+       m_multiline = flags & (1 << 5);
+       m_password  = flags & (1 << 4);
+       m_readonly  = flags & (1 << 3); 
+       bool  has_color      = flags & (1 << 2); 
+       bool  has_max_length = flags & (1 << 1); 
+       bool  has_font       = flags & (1 << 0); 
+
+    flags = in->read_u8();
+    // reserved_bit  = flags & (1 << 7);
+       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);
+       m_html           = flags & (1 << 1); 
+       m_use_outlines   = flags & (1 << 0); 
 
        if (has_font)
        {