[Gnash-commit] gnash ChangeLog server/fill_style.cpp server/te...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/14 20:21:49

Modified files:
        .              : ChangeLog 
        server         : fill_style.cpp textformat.cpp 
        server/asobj   : LoadVars.cpp MovieClipLoader.cpp 

Log message:
        logging cleanups

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5916&r2=1.5917
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.49&r2=1.50

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5916
retrieving revision 1.5917
diff -u -b -r1.5916 -r1.5917
--- ChangeLog   14 Mar 2008 17:55:10 -0000      1.5916
+++ ChangeLog   14 Mar 2008 20:21:48 -0000      1.5917
@@ -1,5 +1,13 @@
 2008-03-14 Sandro Santilli <address@hidden>
 
+       * server/fill_style.cpp: use an int for the temporary num_gradients.
+       * server/textformat.cpp: warn once about unimplemented TextFormat.
+       * server/asobj/LoadVars.cpp: don't trace onData and onLoad methods
+         enter.
+       * server/asobj/MovieClipLoader.cpp: don't trace MovieClip destruction.
+
+2008-03-14 Sandro Santilli <address@hidden>
+
        * server/sprite_instance.cpp (sprite_startDrag): handle
          NaN args (we should probably use ints for dragging in
          general). Fixes bug #22592.

Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/fill_style.cpp       14 Mar 2008 17:51:11 -0000      1.25
+++ server/fill_style.cpp       14 Mar 2008 20:21:49 -0000      1.26
@@ -143,7 +143,7 @@
                // num_gradients is not 8 bits, it is only the last 4.
                // at the moment, the first four are unused, so we may
                // mask, but this needs to be changed.
-        boost::uint8_t num_gradients = in->read_u8() & 15;
+        unsigned int num_gradients = in->read_u8() & 15;
         if ( ! num_gradients )
        {
                IF_VERBOSE_MALFORMED_SWF(
@@ -156,15 +156,17 @@
                        tag_type == SWF::DEFINESHAPE4_) ? 7 : 0))
         {
             // see: http://sswf.sourceforge.net/SWFalexref.html#swf_gradient
-            log_error(_("Unexpected num gradients (%d), expected 1 to 8"),
-                    static_cast<int>(num_gradients));
+               IF_VERBOSE_MALFORMED_SWF(
+            log_swferror(_("Unexpected num gradients (%d), expected 1 to 8"),
+                    num_gradients);
+               );
         }                      
 
                if (is_morph)
                        pOther->m_gradients.resize(num_gradients);
 
         m_gradients.resize(num_gradients);
-           for (int i = 0; i < num_gradients; i++)     {
+           for (unsigned int i = 0; i < num_gradients; i++)    {
                    m_gradients[i].read(in, tag_type);
                        if (is_morph)
                                pOther->m_gradients[i].read(in, tag_type);

Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/textformat.cpp       5 Mar 2008 03:56:00 -0000       1.35
+++ server/textformat.cpp       14 Mar 2008 20:21:49 -0000      1.36
@@ -25,6 +25,8 @@
 #include "namedStrings.h"
 #include "VM.h"
 
+#define ONCE(x) { static bool warned=false; if (!warned) { warned=true; x; } }
+
 namespace gnash {  
 
   text_format::text_format() :
@@ -122,7 +124,7 @@
   //log_debug(_("%s: args=%d"), __FUNCTION__, nargs);
 
   boost::intrusive_ptr<textformat_as_object> text_obj = new 
textformat_as_object;
-  log_unimpl(_("Created New TextFormat object at %p.  Not fully implemented 
yet"), (void*)text_obj.get());
+  ONCE(log_unimpl("TextFormat"));
   
   // tulrich: this looks like it's inserting a method into our
   // caller's env.  setTextFormat is a method on TextField.  So here

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/asobj/LoadVars.cpp   19 Feb 2008 19:20:54 -0000      1.43
+++ server/asobj/LoadVars.cpp   14 Mar 2008 20:21:49 -0000      1.44
@@ -473,7 +473,7 @@
 as_value
 LoadVars::onData_method(const fn_call& fn)
 {
-       GNASH_REPORT_FUNCTION;
+       //GNASH_REPORT_FUNCTION;
 
        as_object* thisPtr = fn.this_ptr.get();
        if ( ! thisPtr ) return as_value();
@@ -507,7 +507,7 @@
 as_value
 LoadVars::onLoad_method(const fn_call& /*fn*/)
 {
-       GNASH_REPORT_FUNCTION;
+       //GNASH_REPORT_FUNCTION;
        return as_value();
 }
 

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/asobj/MovieClipLoader.cpp    19 Feb 2008 19:20:54 -0000      1.49
+++ server/asobj/MovieClipLoader.cpp    14 Mar 2008 20:21:49 -0000      1.50
@@ -186,7 +186,7 @@
 
 MovieClipLoader::~MovieClipLoader()
 {
-       GNASH_REPORT_FUNCTION;
+       //GNASH_REPORT_FUNCTION;
 }
 
 bool