[Gnash-commit] [SCM] Gnash branch, master, updated. 6a2aef5e5716550e816c413046c04ee5fa7e95ee

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  6a2aef5e5716550e816c413046c04ee5fa7e95ee (commit)
      from  918256e66d5e1c00cb181149ee17e6df8b8ef224 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=6a2aef5e5716550e816c413046c04ee5fa7e95ee


commit 6a2aef5e5716550e816c413046c04ee5fa7e95ee
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Nov 25 17:12:04 2010 +0100

    Fix test results for pp.

diff --git a/testsuite/actionscript.all/Transform.as 
b/testsuite/actionscript.all/Transform.as
index 57d13de..b811ec9 100644
--- a/testsuite/actionscript.all/Transform.as
+++ b/testsuite/actionscript.all/Transform.as
@@ -215,18 +215,28 @@ xcheck_equals(mcOld.transform.matrix.toString(), "(a=4, 
b=0.300000011920929, c=0
 // The following group of tests was updated on 2010-08-10 to match
 // FP 9,0,0,115 results (Linux)
 
+near = function(a, b) {
+    return Math.abs(a - b) < 0.01;
+};
+
+nearly_equal = function(m, a, b, c, d, tx, ty) {
+    return near(m.a, a) && near(m.b, b) &&
+           near(m.c, c) && near(m.d, d) &&
+           near(m.tx, tx) && near(m.ty, ty);
+};
+
 conc1 = _root.createEmptyMovieClip("conc1", getNextHighestDepth());
 conc2 = conc1.createEmptyMovieClip("conc2", getNextHighestDepth());
 
-conc1._x = 1.5;
-conc2._x = 0.3;
-check_equals(conc1.transform.concatenatedMatrix.toString(), "(a=1, b=0, c=0, 
d=1, tx=1.5, ty=0)");
-xcheck_equals(conc2.transform.concatenatedMatrix.toString(), "(a=1, b=0, c=0, 
d=1, tx=1.75, ty=0)");
+conc1._x = 40;
+conc2._x = 24;
+
+check(nearly_equal(conc1.transform.concatenatedMatrix, 1, 0, 0, 1, 39.75, 2));
+check(nearly_equal(conc2.transform.concatenatedMatrix, 1, 0, 0, 1, 63.5, 2));
 conc2._width = 3;
 conc1._height = 0.6;
-xcheck_equals(conc1.transform.concatenatedMatrix.toString(), "(a=0, b=0, c=0, 
d=0, tx=1.5, ty=0)");
-xcheck_equals(conc2.transform.concatenatedMatrix.toString(), "(a=0, b=0, c=0, 
d=0, tx=1.5, ty=0)");
-
+xcheck(nearly_equal(conc1.transform.concatenatedMatrix, 0, 0, 0, 0, 39.75, 2));
+xcheck(nearly_equal(conc1.transform.concatenatedMatrix, 0, 0, 0, 0, 39.75, 2));
 
 d = _root.createEmptyMovieClip("tar", 600);
 d.beginFill(0x00ff00);

-----------------------------------------------------------------------

Summary of changes:
 testsuite/actionscript.all/Transform.as |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash