[Gnash-commit] gnash ChangeLog server/types.cpp server/types.h...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/07 08:43:33

Modified files:
        .              : ChangeLog 
        server         : types.cpp types.h styles.cpp 
        server/parser  : shape_character_def.cpp 

Log message:
                * server/types.{cpp,h}: add output operator and toString
                  method for rgba class.
                * server/styles.cpp (fill_stle::read): neater color print.
                * server/parser/shape_character_def.cpp (read):
                  neater parse print.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2257&r2=1.2258
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2257
retrieving revision 1.2258
diff -u -b -r1.2257 -r1.2258
--- ChangeLog   6 Feb 2007 22:10:32 -0000       1.2257
+++ ChangeLog   7 Feb 2007 08:43:32 -0000       1.2258
@@ -1,3 +1,11 @@
+2007-02-07 Sandro Santilli <address@hidden>
+
+       * server/types.{cpp,h}: add output operator and toString
+         method for rgba class.
+       * server/styles.cpp (fill_stle::read): neater color print.
+       * server/parser/shape_character_def.cpp (read):
+         neater parse print.
+
 2007-02-06 Sandro Santilli <address@hidden>
 
        * server/debugger.{h,cpp}: (dissasemble): first argument

Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/types.cpp    5 Dec 2006 22:10:57 -0000       1.17
+++ server/types.cpp    7 Feb 2007 08:43:33 -0000       1.18
@@ -11,7 +11,9 @@
 #include "stream.h"
 #include "render.h"
 #include "gnash.h"
+
 #include <cstring>
+#include <sstream> // for ::print and ::toString
 
 
 #ifndef HAVE_ISFINITE
@@ -220,6 +222,13 @@
                log_parse("rgba: %d %d %d %d", m_r, m_g, m_b, m_a);
        }
 
+       std::string rgba::toString() const
+       // For debugging.
+       {
+               std::stringstream ss;
+               ss << *this;
+               return ss.str();
+       }
        
        void    rgba::set_lerp(const rgba& a, const rgba& b, float f)
        {
@@ -229,6 +238,15 @@
                m_a = (uint8_t) frnd(flerp(a.m_a, b.m_a, f));
        }
 
+std::ostream&
+operator<< (std::ostream& os, const rgba& r)
+{
+       return os << "rgba: "
+               << (unsigned)r.m_r << ", "
+               << (unsigned)r.m_g << ", "
+               << (unsigned)r.m_b << ", "
+               << (unsigned)r.m_a;
+}
 
 }      // end namespace gnash
 

Index: server/types.h
===================================================================
RCS file: /sources/gnash/gnash/server/types.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/types.h      5 Dec 2006 22:10:57 -0000       1.10
+++ server/types.h      7 Feb 2007 08:43:33 -0000       1.11
@@ -12,6 +12,8 @@
 #include "gnash.h"
 #include "tu_types.h"
 
+#include <string>
+
 
 namespace gnash {
        extern bool     s_verbose_action;
@@ -31,6 +33,9 @@
        class rgba
        {
        public:
+
+               friend std::ostream& operator<< (std::ostream& os, const rgba& 
r);
+
                uint8_t m_r, m_g, m_b, m_a;
 
                /// Default RGBA value is FF.FF.FF.FF
@@ -81,8 +86,13 @@
 
                /// Debug log.
                void    print() const;
+
+               /// Debug print.
+               std::string toString() const;
        };
 
+       std::ostream& operator<< (std::ostream& os, const rgba& r);
+
 
 }      // end namespace gnash
 

Index: server/styles.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/styles.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/styles.cpp   11 Jan 2007 14:01:10 -0000      1.29
+++ server/styles.cpp   7 Feb 2007 08:43:33 -0000       1.30
@@ -82,8 +82,7 @@
 
                IF_VERBOSE_PARSE
                (
-        log_parse("  color: ");
-        m_color.print();
+        log_parse("  color: %s", m_color.toString().c_str());
                );
     }
     else if (m_type == SWF::FILL_LINEAR_GRADIENT

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/parser/shape_character_def.cpp       4 Jan 2007 04:03:34 -0000       
1.9
+++ server/parser/shape_character_def.cpp       7 Feb 2007 08:43:33 -0000       
1.10
@@ -6,7 +6,7 @@
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
 
-/* $Id: shape_character_def.cpp,v 1.9 2007/01/04 04:03:34 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.10 2007/02/07 08:43:33 strk Exp $ */
 
 #include "shape_character_def.h"
 
@@ -66,7 +66,7 @@
        }
 
        IF_VERBOSE_PARSE (
-               log_parse("  read_fill_styles: count = %ud", fill_style_count);
+               log_parse("  read_fill_styles: count = %u", fill_style_count);
        );
 
        // Read the styles. 
@@ -84,7 +84,7 @@
                catch (ParserException& e)
                {
                        IF_VERBOSE_MALFORMED_SWF(
-                               log_warning("%s", e.what());
+                               log_swferror("%s", e.what());
                        );
                }
        }
@@ -145,6 +145,13 @@
 {
     if (with_style) {
        m_bound.read(in);
+
+               IF_VERBOSE_PARSE
+               (
+                std::string b = m_bound.toString();
+    log_parse("  bound rect: %s", b.c_str()); 
+               );
+
        read_fill_styles(m_fill_styles, in, tag_type, m);
        read_line_styles(m_line_styles, in, tag_type);
     }