use Sk4f for matrix math

tests/MatrixTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMath.h"
 #include "SkMatrix.h"
 #include "SkMatrixUtils.h"
@@ skipping 781 matching lines @@
     REPORTER_ASSERT(reporter, check_decompScale(m));
     m.setScale(2, 3);
     REPORTER_ASSERT(reporter, check_decompScale(m));
     m.setRotate(35, 0, 0);
     REPORTER_ASSERT(reporter, check_decompScale(m));
 
     m.setScale(1, 0);
     REPORTER_ASSERT(reporter, !check_decompScale(m));
 }
 
-static void test_mappts(skiatest::Reporter* reporter, const SkMatrix& m, const char type[], int n) {
-    const int MAX = 100;
-    SkPoint src[MAX];
-    SkPoint dst0[MAX], dst1[MAX];
-    SkASSERT(n <= MAX);
-
-    SkRandom rand;
-    for (int i = 0; i < n; ++i) {
-        src[i].fX = rand.nextSScalar1() * 100;
-        src[i].fY = rand.nextSScalar1() * 100;
-    }
-
-    m.mapPoints(dst0, src, n);
-    m.mapPts(   dst1, src, n);
-    for (int i = 0; i < n; ++i) {
-        bool eq = SkScalarNearlyEqual(dst0[i].fX, dst1[i].fX) &&
-                  SkScalarNearlyEqual(dst0[i].fY, dst1[i].fY);
-        if (!eq) {
-            SkDebugf("%s [%d] points (%g %g) pts (%g %g)\n", type, i, dst0[i].fX, dst0[i].fY, dst1[i].fX, dst1[i].fY);
-            REPORTER_ASSERT(reporter, eq);
-        }
-    }
-}
-
-static void test_mappts(skiatest::Reporter* reporter) {
-    const int counts[] = { 0, 1, 2, 3, 4, 100 };
-    for (size_t i = 0; i < SK_ARRAY_COUNT(counts); ++i) {
-        const int n = counts[i];
-        SkMatrix m;
-        m.reset();
-        test_mappts(reporter, m, "ident", n);
-        m.setTranslate(2, 3);
-        test_mappts(reporter, m, "trans", n);
-        m.postScale(2, 0.5f);
-        test_mappts(reporter, m, "scale", n);
-        m.postRotate(35);
-        test_mappts(reporter, m, "affine", n);
-        m.setPerspX(0.1f);
-        test_mappts(reporter, m, "persp", n);
-    }
-}
-
 DEF_TEST(Matrix, reporter) {
     SkMatrix    mat, inverse, iden1, iden2;
 
     mat.reset();
     mat.setTranslate(SK_Scalar1, SK_Scalar1);
     REPORTER_ASSERT(reporter, mat.invert(&inverse));
     iden1.setConcat(mat, inverse);
     REPORTER_ASSERT(reporter, is_identity(iden1));
 
     mat.setScale(SkIntToScalar(2), SkIntToScalar(4));
@@ skipping 100 matching lines @@
     REPORTER_ASSERT(reporter, !are_equal(reporter, mat, mat2));
 
     test_matrix_min_max_scale(reporter);
     test_matrix_preserve_shape(reporter);
     test_matrix_recttorect(reporter);
     test_matrix_decomposition(reporter);
     test_matrix_homogeneous(reporter);
     test_set9(reporter);
 
     test_decompScale(reporter);
-
-    test_mappts(reporter);
 }
 
 DEF_TEST(Matrix_Concat, r) {
     SkMatrix a;
     a.setTranslate(10, 20);
 
     SkMatrix b;
     b.setScale(3, 5);
 
     SkMatrix expected;
     expected.setConcat(a,b);
 
     REPORTER_ASSERT(r, expected == SkMatrix::Concat(a, b));
 }