[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/24 08:52:56

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/misc-ming.all: DrawingApiTest.as 
                                 DrawingApiTestRunner.cpp 

Log message:
                * server/sprite_instance.cpp (sprite_lineStyle): alpha value is 
given
                  in percent, always pass the env to number converters.
                * testsuite/misc-ming.all/DrawingApiTest.as: add test checking 
that
                  valueOf is invoked on arguments.
                * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: more 
successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2978&r2=1.2979
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.253&r2=1.254
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2978
retrieving revision 1.2979
diff -u -b -r1.2978 -r1.2979
--- ChangeLog   24 Apr 2007 07:25:19 -0000      1.2978
+++ ChangeLog   24 Apr 2007 08:52:55 -0000      1.2979
@@ -1,5 +1,13 @@
 2007-04-24 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (sprite_lineStyle): alpha value is given
+         in percent, always pass the env to number converters.
+       * testsuite/misc-ming.all/DrawingApiTest.as: add test checking that
+         valueOf is invoked on arguments.
+       * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: more successes.
+
+2007-04-24 Sandro Santilli <address@hidden>
+
        * server/sprite_instance.cpp (on_event): call user-defined function
          even if clip-events have been found.
        * testsuite/misc-ming.all/action_execution_order_extend_test.c:

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -b -r1.253 -r1.254
--- server/sprite_instance.cpp  24 Apr 2007 07:25:20 -0000      1.253
+++ server/sprite_instance.cpp  24 Apr 2007 08:52:55 -0000      1.254
@@ -928,20 +928,20 @@
                return as_value();
        }
 
-       thickness = 
uint16_t(PIXELS_TO_TWIPS(uint16_t(fclamp(fn.arg(0).to_number(), 0, 255))));
+       thickness = 
uint16_t(PIXELS_TO_TWIPS(uint16_t(fclamp(fn.arg(0).to_number(&fn.env()), 0, 
255))));
 
        if ( fn.nargs > 1 )
        {
                // 2^24 is the max here
-               uint32_t rgbval = uint32_t(fclamp(fn.arg(1).to_number(), 0, 
16777216));
+               uint32_t rgbval = 
uint32_t(fclamp(fn.arg(1).to_number(&fn.env()), 0, 16777216));
                r = uint8_t( (rgbval&0xFF0000) >> 16);
                g = uint8_t( (rgbval&0x00FF00) >> 8);
                b = uint8_t( (rgbval&0x0000FF) );
 
                if ( fn.nargs > 2 )
                {
-                       float alphaval = fclamp(fn.arg(2).to_number(), 0, 255);
-                       a = uint8_t(alphaval);
+                       float alphaval = fclamp(fn.arg(2).to_number(&fn.env()), 
0, 100);
+                       a = uint8_t( 255 * (alphaval/100) );
                }
        }
 

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-ming.all/DrawingApiTest.as   24 Apr 2007 08:27:08 -0000      
1.6
+++ testsuite/misc-ming.all/DrawingApiTest.as   24 Apr 2007 08:52:55 -0000      
1.7
@@ -13,12 +13,21 @@
 // ... or on a statically-created one
 //a = _root;
 
+red = new Object();
+red.valueOf = function() { return 0xFF0000; };
+
+thick = new Object();
+thick.valueOf = function() { return 20; };
+
+halftransparent = new Object();
+halftransparent.valueOf = function() { return 50; };
+
 with (a)
 {
        clear();
 
        // The thick red line
-       lineStyle(20, 0xFF0000, 100);
+       lineStyle(thick, red, 100);
        moveTo(100, 100);
        lineTo(200, 200);
 
@@ -29,7 +38,7 @@
 
        // The violet line
        moveTo(100, 200);
-       lineStyle(5, 0xFF00FF, 50);
+       lineStyle(5, 0xFF00FF, halftransparent);
        lineTo(200, 250);
 
        // The yellow line

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp    23 Apr 2007 20:05:20 
-0000      1.8
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp    24 Apr 2007 08:52:55 
-0000      1.9
@@ -58,6 +58,7 @@
        rgba yellow(255, 255, 0, 255);
        rgba black(0, 0, 0, 255);
        rgba violet(255, 0, 255, 255);
+       rgba halftrans_violet(255, 128, 255, 255);
 
        // Out of any drawing
        tester.movePointerTo(50, 50);
@@ -87,27 +88,27 @@
        // Inside red "thick" line
        tester.movePointerTo(146, 146);
        check(tester.isMouseOverMouseEntity());
-       xcheck_pixel(146, 146, 2, red, 2);
+       check_pixel(146, 146, 2, red, 2);
 
        // Over the black "hairlined" line
        tester.movePointerTo(250, 180);
        check(tester.isMouseOverMouseEntity());
-       xcheck_pixel(250, 180, 1, black, 2);
+       check_pixel(250, 180, 1, black, 2);
 
-       // Over the transparent line (244,100)
-       tester.movePointerTo(244, 100);
-       xcheck(!tester.isMouseOverMouseEntity());
-       xcheck_pixel(244, 100, 2, white, 2);
+       // Over the transparent line (150,100)
+       tester.movePointerTo(150, 100);
+       xcheck(!tester.isMouseOverMouseEntity()); // fails due to 
shape_character_def::point_test_local bug 
+       check_pixel(150, 100, 2, white, 2); 
 
        // Over the violet line (146,225)
        tester.movePointerTo(146, 225);
        check(tester.isMouseOverMouseEntity());
-       xcheck_pixel(146, 225, 1, violet, 2);
+       check_pixel(146, 225, 1, halftrans_violet, 2);
 
        // Inside the yellow line
        tester.movePointerTo(270, 232);
        check(tester.isMouseOverMouseEntity());
-       xcheck_pixel(270, 232, 2, yellow, 2);
+       check_pixel(270, 232, 2, yellow, 2);
 
        // Inside the black vertical line
        tester.movePointerTo(82, 127);
@@ -122,6 +123,6 @@
 
        tester.movePointerTo(376, 139);
        xcheck(tester.isMouseOverMouseEntity()); // fails due to 
edge::withinSquareDistance bug
-       xcheck_pixel(376, 139, 2, green, 2); // fails due to bug in AGG
+       check_pixel(376, 139, 2, green, 2); // fails due to bug in AGG
 }