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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Sandro Santilli <strk>  06/11/07 13:11:18

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

Log message:
                * 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&only_with_tag=release_0_7_2&r1=1.1412.2.107&r2=1.1412.2.108
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.30.2.2&r2=1.30.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.69.2.4&r2=1.69.2.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.107
retrieving revision 1.1412.2.108
diff -u -b -r1.1412.2.107 -r1.1412.2.108
--- ChangeLog   7 Nov 2006 12:30:55 -0000       1.1412.2.107
+++ ChangeLog   7 Nov 2006 13:11:17 -0000       1.1412.2.108
@@ -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 Udo Giacomozzi <address@hidden>
 
        * backend/render_handler_agg.cpp: Protected clear_framebuffer()

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -u -b -r1.30.2.2 -r1.30.2.3
--- libbase/log.h       6 Nov 2006 14:13:20 -0000       1.30.2.2
+++ libbase/log.h       7 Nov 2006 13:11:17 -0000       1.30.2.3
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: log.h,v 1.30.2.2 2006/11/06 14:13:20 strk Exp $ */
+/* $Id: log.h,v 1.30.2.3 2006/11/07 13:11:17 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.69.2.4
retrieving revision 1.69.2.5
diff -u -b -r1.69.2.4 -r1.69.2.5
--- server/sprite_instance.cpp  6 Nov 2006 19:23:06 -0000       1.69.2.4
+++ server/sprite_instance.cpp  7 Nov 2006 13:11:17 -0000       1.69.2.5
@@ -394,6 +394,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
@@ -402,12 +406,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;
                }
@@ -416,8 +425,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;
                }
@@ -427,17 +439,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;
                }