remove dead SkPersp macros

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 184 matching lines @@
 
     SkMatrix translate;
     translate.setTranslate(10 * SK_Scalar1, -5 * SK_Scalar1);
     REPORTER_ASSERT(reporter, SK_Scalar1 == translate.getMinScale());
     REPORTER_ASSERT(reporter, SK_Scalar1 == translate.getMaxScale());
     success = translate.getMinMaxScales(scales);
     REPORTER_ASSERT(reporter, success && SK_Scalar1 == scales[0] && SK_Scalar1 == scales[1]);
 
     SkMatrix perspX;
     perspX.reset();
-    perspX.setPerspX(SkScalarToPersp(SK_Scalar1 / 1000));
+    perspX.setPerspX(SK_Scalar1 / 1000);
     REPORTER_ASSERT(reporter, -SK_Scalar1 == perspX.getMinScale());
     REPORTER_ASSERT(reporter, -SK_Scalar1 == perspX.getMaxScale());
     // Verify that getMinMaxScales() doesn't update the scales array on failure.
     scales[0] = -5;
     scales[1] = -5;
     success = perspX.getMinMaxScales(scales);
     REPORTER_ASSERT(reporter, !success && -5 * SK_Scalar1 == scales[0] && -5 * SK_Scalar1  == scales[1]);
 
     SkMatrix perspY;
     perspY.reset();
-    perspY.setPerspY(SkScalarToPersp(-SK_Scalar1 / 500));
+    perspY.setPerspY(-SK_Scalar1 / 500);
     REPORTER_ASSERT(reporter, -SK_Scalar1 == perspY.getMinScale());
     REPORTER_ASSERT(reporter, -SK_Scalar1 == perspY.getMaxScale());
     scales[0] = -5;
     scales[1] = -5;
     success = perspY.getMinMaxScales(scales);
     REPORTER_ASSERT(reporter, !success && -5 * SK_Scalar1 == scales[0] && -5 * SK_Scalar1  == scales[1]);
 
     SkMatrix baseMats[] = {scale, rot90Scale, rotate,
                            translate, perspX, perspY};
     SkMatrix mats[2*SK_ARRAY_COUNT(baseMats)];
@@ skipping 124 matching lines @@
 
     // skew with different size at a pivot point
     mat.reset();
     mat.setSkew(SkIntToScalar(15), SkIntToScalar(20),
                 SkIntToScalar(2), SkIntToScalar(2));
     REPORTER_ASSERT(reporter, !mat.isSimilarity());
     REPORTER_ASSERT(reporter, !mat.preservesRightAngles());
 
     // perspective x
     mat.reset();
-    mat.setPerspX(SkScalarToPersp(SK_Scalar1 / 2));
+    mat.setPerspX(SK_Scalar1 / 2);
     REPORTER_ASSERT(reporter, !mat.isSimilarity());
     REPORTER_ASSERT(reporter, !mat.preservesRightAngles());
 
     // perspective y
     mat.reset();
-    mat.setPerspY(SkScalarToPersp(SK_Scalar1 / 2));
+    mat.setPerspY(SK_Scalar1 / 2);
     REPORTER_ASSERT(reporter, !mat.isSimilarity());
     REPORTER_ASSERT(reporter, !mat.preservesRightAngles());
 
     // rotate
     for (int angle = 0; angle < 360; ++angle) {
         mat.reset();
         mat.setRotate(SkIntToScalar(angle));
         REPORTER_ASSERT(reporter, mat.isSimilarity());
         REPORTER_ASSERT(reporter, mat.preservesRightAngles());
     }
@@ skipping 482 matching lines @@
 
     #define affineEqual(e) affine[SkMatrix::kA##e] == mat.get(SkMatrix::kM##e)
     REPORTER_ASSERT(reporter, affineEqual(ScaleX));
     REPORTER_ASSERT(reporter, affineEqual(SkewY));
     REPORTER_ASSERT(reporter, affineEqual(SkewX));
     REPORTER_ASSERT(reporter, affineEqual(ScaleY));
     REPORTER_ASSERT(reporter, affineEqual(TransX));
     REPORTER_ASSERT(reporter, affineEqual(TransY));
     #undef affineEqual
 
-    mat.set(SkMatrix::kMPersp1, SkScalarToPersp(SK_Scalar1 / 2));
+    mat.set(SkMatrix::kMPersp1, SK_Scalar1 / 2);
     REPORTER_ASSERT(reporter, !mat.asAffine(affine));
 
     SkMatrix mat2;
     mat2.reset();
     mat.reset();
     SkScalar zero = 0;
     mat.set(SkMatrix::kMSkewX, -zero);
     REPORTER_ASSERT(reporter, are_equal(reporter, mat, mat2));
 
     mat2.reset();
@@ skipping 15 matching lines @@
     a.setTranslate(10, 20);
 
     SkMatrix b;
     b.setScale(3, 5);
 
     SkMatrix expected;
     expected.setConcat(a,b);
 
     REPORTER_ASSERT(r, expected == SkMatrix::Concat(a, b));
 }