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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/10 21:09:00

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

Log message:
                * server/swf/tag_loaders.cpp (readPlaceObject2): reduce
                  calls to IF_VERBOSE_PARSE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2831&r2=1.2832
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2831
retrieving revision 1.2832
diff -u -b -r1.2831 -r1.2832
--- ChangeLog   10 Apr 2007 20:24:22 -0000      1.2831
+++ ChangeLog   10 Apr 2007 21:09:00 -0000      1.2832
@@ -1,3 +1,8 @@
+2007-04-10 Sandro Santilli <address@hidden>
+
+       * server/swf/tag_loaders.cpp (readPlaceObject2): reduce
+         calls to IF_VERBOSE_PARSE.
+
 2007-04-10 Bastiaan Jacques <address@hidden>
 
        * server/asobj/NetStreamFfmpeg.{cpp,h}: Don't call delete on a

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/swf/tag_loaders.cpp  10 Apr 2007 15:48:39 -0000      1.86
+++ server/swf/tag_loaders.cpp  10 Apr 2007 21:09:00 -0000      1.87
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.86 2007/04/10 15:48:39 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.87 2007/04/10 21:09:00 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1002,62 +1002,25 @@
 
                m_depth = in->read_u16()+character::staticDepthOffset;
 
-               IF_VERBOSE_PARSE
-               (
-                    log_parse("  depth = %d (%d)", m_depth, 
m_depth-character::staticDepthOffset);
-               );
-
-               if (has_char)
-               {
-                       m_character_id = in->read_u16();
-                       IF_VERBOSE_PARSE (
-                               log_parse("  char id = %d", m_character_id);
-                       );
-               }
+               if (has_char) m_character_id = in->read_u16();
 
                if (has_matrix)
                {
                        m_has_matrix = true;
                        m_matrix.read(in);
-                       IF_VERBOSE_PARSE (
-                               log_parse("  mat:");
-                               m_matrix.print();
-                       );
                }
 
                if (has_cxform)
                {
                        m_has_cxform = true;
                        m_color_transform.read_rgba(in);
-                       IF_VERBOSE_PARSE (
-                               log_parse("  cxform:");
-                               m_color_transform.print();
-                       );
                }
                                
-               if (has_ratio)
-               {
-                       m_ratio = (float)in->read_u16() / (float)65535;
-                       IF_VERBOSE_PARSE (
-                               log_parse("  ratio: %f", m_ratio);
-                       );
-               }
+               if (has_ratio) m_ratio = (float)in->read_u16() / (float)65535;
                                
-               if (has_name)
-               {
-                       m_name = in->read_string();
-                       IF_VERBOSE_PARSE (
-                               log_parse("  name = %s", m_name ? m_name : 
"<null>");
-                       );
-               }
+               if (has_name) m_name = in->read_string();
 
-               if (has_clip_bracket)
-               {
-                       m_clip_depth = 
in->read_u16()+character::staticDepthOffset; 
-                       IF_VERBOSE_PARSE (
-                               log_parse("  clip_depth = %d (%d)", 
m_clip_depth, m_clip_depth-character::staticDepthOffset);
-                       );
-               }
+               if (has_clip_bracket) m_clip_depth = 
in->read_u16()+character::staticDepthOffset; 
 
                if (has_actions)
                {
@@ -1081,6 +1044,27 @@
                        m_place_type = PLACE;
                }
                                 
+               IF_VERBOSE_PARSE (
+                       log_parse("  PLACEOBJECT2: depth = %d (%d)", m_depth, 
m_depth-character::staticDepthOffset);
+                       if ( has_char ) log_parse("  char id = %d", 
m_character_id);
+                       if ( has_matrix ) 
+                       {
+                               log_parse("  mat:");
+                               m_matrix.print();
+                       }
+                       if ( has_cxform )
+                       {
+                               log_parse("  cxform:");
+                               m_color_transform.print();
+                       }
+                       if ( has_ratio ) log_parse("  ratio: %f", m_ratio);
+                       if ( has_name ) log_parse("  name = %s", m_name ? 
m_name : "<null>");
+                       if ( has_clip_bracket ) log_parse("  clip_depth = %d 
(%d)", m_clip_depth, m_clip_depth-character::staticDepthOffset);
+                       log_parse(" m_place_type: %d", m_place_type);
+               );
+                               
+
+                                
                //log_msg("place object at depth %i", m_depth);
        }