[Gnash-commit] gnash ChangeLog server/asobj/flash/geom/Point_a...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/19 16:32:24

Modified files:
        .              : ChangeLog 
        server/asobj/flash/geom: Point_as.cpp 
        testsuite/actionscript.all: Point.as 
        testsuite/swfdec: PASSING 

Log message:
        * server/asobj/flash/geom/Point_as.cpp: sqrtf->std::sqrt,
          drop some early outs with wrong assumption (non-finite is not
          necessarely NaN)
        * testsuite/actionscript.all/Point.as: test that length of a Point
          with Infinite ordinate is Infinite.
        * testsuite/swfdec/PASSING: point-8.swf succeeds now.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6650&r2=1.6651
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/flash/geom/Point_as.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Point.as?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.141&r2=1.142

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6650
retrieving revision 1.6651
diff -u -b -r1.6650 -r1.6651
--- ChangeLog   19 May 2008 15:59:25 -0000      1.6650
+++ ChangeLog   19 May 2008 16:32:23 -0000      1.6651
@@ -1,5 +1,14 @@
 2008-05-19 Sandro Santilli <address@hidden>
 
+       * server/asobj/flash/geom/Point_as.cpp: sqrtf->std::sqrt,
+         drop some early outs with wrong assumption (non-finite is not
+         necessarely NaN)
+       * testsuite/actionscript.all/Point.as: test that length of a Point
+         with Infinite ordinate is Infinite.
+       * testsuite/swfdec/PASSING: point-8.swf succeeds now.
+
+2008-05-19 Sandro Santilli <address@hidden>
+
        * server/asobj/flash/geom/Point_as.cpp: 
          Implement Point.normalize(), Point.offset(), Point.subtract()
          and Point.polar().

Index: server/asobj/flash/geom/Point_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/flash/geom/Point_as.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/flash/geom/Point_as.cpp        19 May 2008 15:59:25 -0000      
1.12
+++ server/asobj/flash/geom/Point_as.cpp        19 May 2008 16:32:23 -0000      
1.13
@@ -276,7 +276,7 @@
 
        if ( x == 0 && y == 0 ) return as_value();
 
-       double curlen = sqrt(x*x+y*y);
+       double curlen = std::sqrt(x*x+y*y);
        double fact = newlen/curlen;
 
 
@@ -407,11 +407,9 @@
                ptr->get_member(NSV::PROP_X, &xval);
                ptr->get_member(NSV::PROP_Y, &yval);
                double x = xval.to_number();
-               if ( ! utility::isFinite(x) ) return as_value(NAN);
                double y = yval.to_number();
-               if ( ! utility::isFinite(y) ) return as_value(NAN);
 
-               double l = sqrt(x*x+y*y);
+               double l = std::sqrt(x*x+y*y);
                return as_value(l);
        }
        else // setter
@@ -471,28 +469,28 @@
        as_value x1val;
        o1->get_member(NSV::PROP_X, &x1val);
        double x1 = x1val.to_number();
-       if ( ! utility::isFinite(x1) ) return as_value(NAN);
+       //if ( ! utility::isFinite(x1) ) return as_value(NAN);
 
        as_value y1val;
        o1->get_member(NSV::PROP_Y, &y1val);
        double y1 = y1val.to_number();
-       if ( ! utility::isFinite(y1) ) return as_value(NAN);
+       //if ( ! utility::isFinite(y1) ) return as_value(NAN);
 
        as_value x2val;
        o2->get_member(NSV::PROP_X, &x2val);
        double x2 = x2val.to_number();
-       if ( ! utility::isFinite(x2) ) return as_value(NAN);
+       //if ( ! utility::isFinite(x2) ) return as_value(NAN);
 
        as_value y2val;
        o2->get_member(NSV::PROP_Y, &y2val);
        double y2 = y2val.to_number();
-       if ( ! utility::isFinite(y2) ) return as_value(NAN);
+       //if ( ! utility::isFinite(y2) ) return as_value(NAN);
 
        double hside = x2 - x1; // p1.x - p0.x;
        double vside = y2 - y1; // p1.y - p0.y;
 
        double sqdist = hside*hside + vside*vside;
-       double dist = sqrtf(sqdist);
+       double dist = std::sqrt(sqdist);
 
        return as_value(dist);
 }

Index: testsuite/actionscript.all/Point.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Point.as,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/actionscript.all/Point.as 19 May 2008 15:59:25 -0000      1.5
+++ testsuite/actionscript.all/Point.as 19 May 2008 16:32:24 -0000      1.6
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Point.as,v 1.5 2008/05/19 15:59:25 strk Exp $";
+rcsid="$Id: Point.as,v 1.6 2008/05/19 16:32:24 strk Exp $";
 
 #include "check.as"
 
@@ -88,6 +88,12 @@
 p0.length = 10;
 check_equals(p0.length, 5);
 
+p0 = new Point(50, -Infinity);
+check_equals(p0.length, Infinity);
+
+p0 = new Point(0, 0);
+check_equals(p0.length, 0);
+
 //-------------------------------------------------------------
 // Test Point.add
 //-------------------------------------------------------------
@@ -476,6 +482,6 @@
 // END OF TEST
 //-------------------------------------------------------------
 
-check_totals(176);
+check_totals(178);
 
 #endif // OUTPUT_VERSION >= 8

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- testsuite/swfdec/PASSING    17 May 2008 20:10:38 -0000      1.141
+++ testsuite/swfdec/PASSING    19 May 2008 16:32:24 -0000      1.142
@@ -649,6 +649,7 @@
 place-object-remove-name-6.swf:302e32a0834a50f219f8ab9a15234c41
 place-object-remove-name-7.swf:689ff2c69386d51ce336691cb485ab55
 point-5.swf:9e49aa1df7118acccf003ae0648ef439
+point-8.swf:71eaa77c0f2140096edda7522da49f99
 point-properties-5.swf:2b1071acd6c53d5342c1946214a3b3df
 point-properties-5.swf:c3439d59fa29fb709630ee3a3ad230b0
 preload.swf:2fd2da9440e29289e83dadd1ed9c99c4