[Gnash-commit] gnash ChangeLog server/matrix.cpp testsuite/act...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/14 13:28:32

Modified files:
        .              : ChangeLog 
        server         : matrix.cpp 
        testsuite/actionscript.all: MovieClip.as 

Log message:
                * server/matrix.cpp: fix conceptual bug in Range2d transform
                  function.
                * testsuite/actionscript.all/MovieClip.as: one unexpected
                  success when fetching _height.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2869&r2=1.2870
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2869
retrieving revision 1.2870
diff -u -b -r1.2869 -r1.2870
--- ChangeLog   13 Apr 2007 09:15:54 -0000      1.2869
+++ ChangeLog   14 Apr 2007 13:28:31 -0000      1.2870
@@ -1,3 +1,10 @@
+2007-04-12 Sandro Santilli <address@hidden>
+
+       * server/matrix.cpp: fix conceptual bug in Range2d transform
+         function.
+       * testsuite/actionscript.all/MovieClip.as: one unexpected
+         success when fetching _height.
+
 2007-04-12 Bastiaan Jacques <address@hidden>
 
        * server/parser/movie_def_impl.{cpp,h}: Replace pthread usage

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/matrix.cpp   12 Apr 2007 09:14:36 -0000      1.8
+++ server/matrix.cpp   14 Apr 2007 13:28:32 -0000      1.9
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <address@hidden> 2003
 //
-// $Id: matrix.cpp,v 1.8 2007/04/12 09:14:36 strk Exp $ 
+// $Id: matrix.cpp,v 1.9 2007/04/14 13:28:32 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -227,17 +227,17 @@
        float ymin = r.getMinY();
        float ymax = r.getMaxY();
 
-       xmin = m_[0][0] * xmin + m_[0][1] * ymin + m_[0][2];
-       ymin = m_[1][0] * xmin + m_[1][1] * ymin + m_[1][2];
+       float n_xmin = m_[0][0] * xmin + m_[0][1] * ymin + m_[0][2];
+       float n_ymin = m_[1][0] * xmin + m_[1][1] * ymin + m_[1][2];
 
-       xmax = m_[0][0] * xmax + m_[0][1] * ymax + m_[0][2];
-       ymax = m_[1][0] * xmax + m_[1][1] * ymax + m_[1][2];
+       float n_xmax = m_[0][0] * xmax + m_[0][1] * ymax + m_[0][2];
+       float n_ymax = m_[1][0] * xmax + m_[1][1] * ymax + m_[1][2];
 
        // Rotation can swap the max/min coordinates
-       if ( xmax < xmin ) std::swap(xmin, xmax);
-       if ( ymax < ymin ) std::swap(ymin, ymax);
+       if ( n_xmax < n_xmin ) std::swap(n_xmin, n_xmax);
+       if ( n_ymax < n_ymin ) std::swap(n_ymin, n_ymax);
 
-       r.setTo(xmin, ymin, xmax, ymax);
+       r.setTo(n_xmin, n_ymin, n_xmax, n_ymax);
 }
 
 void

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- testsuite/actionscript.all/MovieClip.as     12 Apr 2007 09:14:36 -0000      
1.54
+++ testsuite/actionscript.all/MovieClip.as     14 Apr 2007 13:28:32 -0000      
1.55
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.54 2007/04/12 09:14:36 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.55 2007/04/14 13:28:32 strk Exp $";
 
 #include "check.as"
 
@@ -604,7 +604,7 @@
 
 draw._xscale = 200;
 check_equals(draw._width, 20);
-xcheck_equals(draw._height, 20);
+check_equals(draw._height, 20);
 
 draw._rotation = 0;
 xcheck_equals(draw._width, 20);