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

[Sandro Santilli]

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

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

Log message:
                * server/DynamicShape.cpp: close filled paths on pen move and
                  ::finalize for last path.
                * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: all pixel 
checking
                  succeed now. The only failures left are hitTest-related. Time 
to
                  resume the old point_test implementation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4793&r2=1.4794
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DynamicShape.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4793
retrieving revision 1.4794
diff -u -b -r1.4793 -r1.4794
--- ChangeLog   7 Nov 2007 12:08:15 -0000       1.4793
+++ ChangeLog   7 Nov 2007 14:06:15 -0000       1.4794
@@ -1,5 +1,13 @@
 2007-11-07 Sandro Santilli <address@hidden>
 
+       * server/DynamicShape.cpp: close filled paths on pen move and
+         ::finalize for last path.
+       * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: all pixel checking
+         succeed now. The only failures left are hitTest-related. Time to
+         resume the old point_test implementation.
+
+2007-11-07 Sandro Santilli <address@hidden>
+
        * server/DynamicShape.{cpp,h}: Start new paths as new shapes
          when beginFill is called.
        * server/shape.{cpp,h}: add interfaces for setting m_new_shape

Index: server/DynamicShape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DynamicShape.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/DynamicShape.cpp     7 Nov 2007 12:08:16 -0000       1.11
+++ server/DynamicShape.cpp     7 Nov 2007 14:06:16 -0000       1.12
@@ -17,7 +17,7 @@
 
 
 
-/* $Id: DynamicShape.cpp,v 1.11 2007/11/07 12:08:16 strk Exp $ */
+/* $Id: DynamicShape.cpp,v 1.12 2007/11/07 14:06:16 strk Exp $ */
 
 #include "DynamicShape.h"
 
@@ -91,7 +91,9 @@
 void
 DynamicShape::startNewPath(bool newShape)
 {
-       // Close any pending filled style
+       // Close any pending filled path
+       if ( _currpath && _currfill) _currpath->close();
+
        // The DrawingApiTest.swf file shows we should NOT
        // necessarely end the current fill when starting a new one.
        //endFill();
@@ -108,6 +110,14 @@
        // Nothing to do if not changed
        if ( ! _changed ) return;
 
+       // Close any pending filled path (_currpath should be last path)
+       if ( _currpath && _currfill)
+       {
+               assert( ! m_paths.empty() );
+               assert( _currpath == &(m_paths.back()) );
+               _currpath->close();
+       }
+
        // TODO: check consistency of fills and such !
 
        _changed = false;
@@ -135,6 +145,7 @@
        {
                _x = x;
                _y = y;
+
                // TODO: close previous path if any and filled ?
                startNewPath(false); // don't make this the start of a new 
subshape (to verify)
        }

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp    7 Nov 2007 12:08:16 
-0000       1.31
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp    7 Nov 2007 14:06:16 
-0000       1.32
@@ -522,7 +522,7 @@
        //--------------------------------------------------------------
 
        // In the right green 'el' shape (not explicitly closed fill)
-       xcheck_pixel(80, 170, 2, green, 2);
+       check_pixel(80, 170, 2, green, 2);
 
        // Outside the right green 'el' shape
        // (but close to the auto-closing edge)
@@ -530,14 +530,14 @@
 
        // In the left green horizontally flipped 'el' shape
        // (not explicitly closed fill)
-       xcheck_pixel(30, 170, 2, green, 2);
+       check_pixel(30, 170, 2, green, 2);
 
        // Outside the left green 'el' shape
        // (but close to the auto-closing edge)
        check_pixel(20, 144, 2, white, 2);
 
        // Between the two 'el' shapes
-       xcheck_pixel(56, 170, 2, white, 2);
+       check_pixel(56, 170, 2, white, 2);
 
        //--------------------------------------------------------------
        // The red crossing edges case 
@@ -566,7 +566,7 @@
        // lower-left
        check_pixel(136, 75, 2, white, 2);
        // lower-center
-       xcheck_pixel(156, 75, 2, white, 2);
+       check_pixel(156, 75, 2, white, 2);
        // lower-right
        check_pixel(175, 75, 2, white, 2);
        // center-right
@@ -574,9 +574,9 @@
        // upper-right
        check_pixel(175, 35, 2, white, 2);
        // upper-center
-       xcheck_pixel(156, 35, 2, white, 2);
+       check_pixel(156, 35, 2, white, 2);
        // center
-       xcheck_pixel(156, 57, 2, white, 2);
+       check_pixel(156, 57, 2, white, 2);
 
        //--------------------------------------------------------------
        // The nested squares cases