[Gnash-commit] gnash ChangeLog libbase/log.h server/sprite_ins...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/07 16:51:29

Modified files:
        .              : ChangeLog 
        libbase        : log.h 
        server         : sprite_instance.cpp 

Log message:
        (Fwd port)
                * libbase/log.h: don't warn about ASCODING errors by default
                * server/sprite_instance.cpp (sprite_hit_test): warn
                  only once about hitTest not being implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1546&r2=1.1547
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.75&r2=1.76

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1546
retrieving revision 1.1547
diff -u -b -r1.1546 -r1.1547
--- ChangeLog   7 Nov 2006 16:37:57 -0000       1.1546
+++ ChangeLog   7 Nov 2006 16:51:29 -0000       1.1547
@@ -1,3 +1,9 @@
+2006-11-07 Sandro Santilli <address@hidden>
+
+       * libbase/log.h: don't warn about ASCODING errors by default
+       * server/sprite_instance.cpp (sprite_hit_test): warn
+         only once about hitTest not being implemented.
+
 2006-11-07 Vitaly Alexeev <address@hidden>
 
        * backend\render_handler_ogl.cpp:  The elementary yuv-video opengl

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- libbase/log.h       5 Nov 2006 14:15:36 -0000       1.32
+++ libbase/log.h       7 Nov 2006 16:51:29 -0000       1.33
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: log.h,v 1.32 2006/11/05 14:15:36 strk Exp $ */
+/* $Id: log.h,v 1.33 2006/11/07 16:51:29 strk Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -178,7 +178,7 @@
 #define VERBOSE_ACTION 1
 
 // Undefine this to remove ActionScript errors verbosity
-#define VERBOSE_ASCODING_ERRORS 
+//#define VERBOSE_ASCODING_ERRORS 
 
 // Undefine this to remove invalid SWF verbosity
 #define VERBOSE_MALFORMED_SWF

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/sprite_instance.cpp  6 Nov 2006 19:23:31 -0000       1.75
+++ server/sprite_instance.cpp  7 Nov 2006 16:51:29 -0000       1.76
@@ -474,6 +474,10 @@
        assert(dynamic_cast<sprite_instance*>(fn.this_ptr));
        //sprite_instance* sprite = static_cast<sprite_instance*>(fn.this_ptr);
 
+       static bool warned_1_arg = false;
+       static bool warned_2_arg = false;
+       static bool warned_3_arg = false;
+
        switch (fn.nargs)
        {
                case 1: // target
@@ -482,12 +486,17 @@
                        character* target = fn.env->find_target(tgt_val);
                        if ( ! target )
                        {
-                               log_error("Can't find hitTest target %s",
+                               IF_VERBOSE_ASCODING_ERRORS(
+                               log_warning("Can't find hitTest target %s",
                                        tgt_val.to_string());
+                               );
                                fn.result->set_undefined();
                                return;
                        }
-                       log_error("hitTest(target) unimplemented");
+                       if ( ! warned_1_arg ) {
+                               log_warning("hitTest(target) unimplemented");
+                               warned_1_arg=true;
+                       }
                        fn.result->set_undefined();
                        break;
                }
@@ -496,8 +505,11 @@
                {
                        double x = fn.arg(0).to_number();
                        double y = fn.arg(1).to_number();
+                       if ( ! warned_2_arg ) {
                        log_error("hitTest(%g,%g) unimplemented",
                                x,y);
+                               warned_2_arg=true;
+                       }
                        fn.result->set_undefined();
                        break;
                }
@@ -507,17 +519,21 @@
                        double x = fn.arg(0).to_number();
                        double y = fn.arg(1).to_number();
                        bool shapeFlag = fn.arg(2).to_bool();
+                       if ( ! warned_3_arg ) {
                        log_error("hitTest(%g,%g,%d) unimplemented",
                                x,y,shapeFlag);
+                               warned_3_arg=true;
+                       }
                        fn.result->set_undefined();
                        break;
                }
 
                default:
                {
-                       log_error("hitTest() called with %u args."
-                               " Malformed SWF ?",
+                       IF_VERBOSE_ASCODING_ERRORS(
+                               log_warning("hitTest() called with %u args."
                                fn.nargs);
+                       );
                        fn.result->set_undefined();
                        break;
                }