[Gnash-commit] gnash ChangeLog server/DynamicShape.cpp testsui...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/23 13:45:18

Modified files:
        .              : ChangeLog 
        server         : DynamicShape.cpp 
        testsuite/misc-ming.all: DrawingApiTestRunner.cpp 
                                 masks_testrunner.cpp 

Log message:
                * server/DynamicShape.cpp (moveTo): do not reset current
                  fill style on move. Fixes some of the tests in 
DrawingApiTest.swf
                  and masks_test.swf.
                * testsuite/misc-ming.all/: DrawingApiTestRunner.cpp,
                  masks_testrunner.cpp: some more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2969&r2=1.2970
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DynamicShape.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_testrunner.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2969
retrieving revision 1.2970
diff -u -b -r1.2969 -r1.2970
--- ChangeLog   23 Apr 2007 13:32:14 -0000      1.2969
+++ ChangeLog   23 Apr 2007 13:45:17 -0000      1.2970
@@ -1,5 +1,13 @@
 2007-04-23 Sandro Santilli <address@hidden>
 
+       * server/DynamicShape.cpp (moveTo): do not reset current
+         fill style on move. Fixes some of the tests in DrawingApiTest.swf
+         and masks_test.swf.
+       * testsuite/misc-ming.all/: DrawingApiTestRunner.cpp,
+         masks_testrunner.cpp: some more successes.
+
+2007-04-23 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/: DrawingApiTest.as,
          DrawingApiTestRunner.cpp: add rendering tests.
          Add a drawing in which move() is called after beginFill()

Index: server/DynamicShape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DynamicShape.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/DynamicShape.cpp     19 Feb 2007 22:51:50 -0000      1.4
+++ server/DynamicShape.cpp     23 Apr 2007 13:45:18 -0000      1.5
@@ -16,7 +16,7 @@
 
 
 
-/* $Id: DynamicShape.cpp,v 1.4 2007/02/19 22:51:50 strk Exp $ */
+/* $Id: DynamicShape.cpp,v 1.5 2007/04/23 13:45:18 strk Exp $ */
 
 #include "DynamicShape.h"
 
@@ -90,9 +90,13 @@
 DynamicShape::startNewPath()
 {
        // Close any pending filled style
-       endFill();
+       // The DrawingApiTest.swf file shows we should NOT
+       // necessarely end the current fill when starting a new one.
+       //endFill();
 
-       path newPath(_x, _y, _currfill, _currfill, _currline);
+       // A quick test shows that *left* always work fine !
+       // More than that, using a *right* fill seems to break the tests !
+       path newPath(_x, _y, _currfill, 0, _currline);
        add_path(newPath);
 }
 

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp    23 Apr 2007 13:32:15 
-0000      1.4
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp    23 Apr 2007 13:45:18 
-0000      1.5
@@ -82,21 +82,21 @@
        // Inside violet fill
        tester.movePointerTo(250, 112);
        check(tester.isMouseOverMouseEntity());
-       xcheck_pixel(250, 112, 2, violet, 1);
+       check_pixel(250, 112, 2, violet, 1);
 
        // Inside red "thick" line
        tester.movePointerTo(146, 146);
-       xcheck(tester.isMouseOverMouseEntity());
+       check(tester.isMouseOverMouseEntity());
        xcheck_pixel(146, 146, 2, red, 2);
 
        // Inside the yellow line
        tester.movePointerTo(270, 232);
-       xcheck(tester.isMouseOverMouseEntity());
+       check(tester.isMouseOverMouseEntity());
        xcheck_pixel(270, 232, 2, yellow, 2);
 
        // Inside the black vertical line
        tester.movePointerTo(82, 127);
-       xcheck(tester.isMouseOverMouseEntity());
+       check(tester.isMouseOverMouseEntity());
        check_pixel(82, 127, 2, black, 2);
 
 }

Index: testsuite/misc-ming.all/masks_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/masks_testrunner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/masks_testrunner.cpp        23 Apr 2007 12:30:08 
-0000      1.1
+++ testsuite/misc-ming.all/masks_testrunner.cpp        23 Apr 2007 13:45:18 
-0000      1.2
@@ -1,5 +1,5 @@
 /* 
- *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,14 +108,14 @@
        xcheck_pixel(14,331, 2, blue, 2);
        // 48,331 = violet (blue behind)
        check( invalidated.contains(48, 331) );
-       xcheck_pixel(48,331, 2, violet, 2);
+       check_pixel(48,331, 2, violet, 2);
        // 80,331 = violet
        check( invalidated.contains(80, 331) );
-       xcheck_pixel(80,331, 2, violet, 2);
+       check_pixel(80,331, 2, violet, 2);
 
        // 214,331 = dark_green
        check( invalidated.contains(214, 331) );
-       xcheck_pixel(214,331, 2, dark_green, 2);
+       check_pixel(214,331, 2, dark_green, 2);
        // 248,331 = light_blue (dark_green behind)
        check( invalidated.contains(248, 331) );
        xcheck_pixel(248,331, 2, light_blue, 2);