[Gnash-commit] gnash ChangeLog server/shape.cpp server/shape.h...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/24 10:01:47

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

Log message:
                * server/shape.{cpp,h} (point_test): only check for the
                  "interior" of the shape, forget its boundaries.
                * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: one
                  more success.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2980&r2=1.2981
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2980
retrieving revision 1.2981
diff -u -b -r1.2980 -r1.2981
--- ChangeLog   24 Apr 2007 09:20:15 -0000      1.2980
+++ ChangeLog   24 Apr 2007 10:01:46 -0000      1.2981
@@ -1,5 +1,12 @@
 2007-04-24 Sandro Santilli <address@hidden>
 
+       * server/shape.{cpp,h} (point_test): only check for the
+         "interior" of the shape, forget its boundaries.
+       * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: one
+         more success.
+
+2007-04-24 Sandro Santilli <address@hidden>
+
        * server/shape.{cpp,h}: const-corrected point_test and
          wihinSquareDistance();
        * server/sprite_instance.cpp (sprite_lineStyle): alpha value is given

Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/shape.cpp    24 Apr 2007 09:20:15 -0000      1.35
+++ server/shape.cpp    24 Apr 2007 10:01:46 -0000      1.36
@@ -187,8 +187,8 @@
            // See if (x0,y0)-(x1,y1) crosses (x,y)-(infinity,y)
            
            // Does the segment straddle the horizontal ray?
-           bool cross_up = (y0 < y && y1 >= y);
-           bool cross_down = (!cross_up) && (y0 > y && y1 <= y);
+           bool cross_up = (y0 < y && y1 > y);
+           bool cross_down = (!cross_up) && (y0 > y && y1 < y);
            if (cross_up || cross_down) {
                // Straddles.
                

Index: server/shape.h
===================================================================
RCS file: /sources/gnash/gnash/server/shape.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/shape.h      24 Apr 2007 09:20:15 -0000      1.22
+++ server/shape.h      24 Apr 2007 10:01:46 -0000      1.23
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape.h,v 1.22 2007/04/24 09:20:15 strk Exp $ */
+/* $Id: shape.h,v 1.23 2007/04/24 10:01:46 strk Exp $ */
 
 #ifndef GNASH_SHAPE_H
 #define GNASH_SHAPE_H
@@ -111,6 +111,10 @@
                /// Return true if the query point is on the filled
                /// interior of this shape.
                ///
+               /// Note that boundaries are NOT checked (a point of the 
boundary
+               /// will return false here).
+               /// Use withinSquareDistance() for boundary checking.
+               ///
                /// Return false if this path has no associated fill.
                ///
                /// WARNING: often a filled shape is composed by multiple

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp    24 Apr 2007 08:52:55 
-0000      1.9
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp    24 Apr 2007 10:01:47 
-0000      1.10
@@ -97,7 +97,7 @@
 
        // Over the transparent line (150,100)
        tester.movePointerTo(150, 100);
-       xcheck(!tester.isMouseOverMouseEntity()); // fails due to 
shape_character_def::point_test_local bug 
+       check(!tester.isMouseOverMouseEntity()); 
        check_pixel(150, 100, 2, white, 2); 
 
        // Over the violet line (146,225)