remove SkFloatToScalar macro

tests/PathMeasureTest.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 "Test.h"
 #include "SkPathMeasure.h"
 
@@ skipping 33 matching lines @@
     meas.getLength();
 #endif
 }
 
 static void test_small_segment() {
 #ifdef SK_SCALAR_IS_FLOAT
     SkPath path;
     const SkPoint pts[] = {
         { 100000, 100000},
         // big jump between these points, makes a big segment
-        { SkFloatToScalar(1.0005f), SkFloatToScalar(0.9999f) },
+        { 1.0005f, 0.9999f },
         // tiny (non-zero) jump between these points
         { SK_Scalar1, SK_Scalar1 },
     };
 
     path.moveTo(pts[0]);
     for (size_t i = 1; i < SK_ARRAY_COUNT(pts); ++i) {
         path.lineTo(pts[i]);
     }
     SkPathMeasure meas(path, false);
 
@@ skipping 51 matching lines @@
     REPORTER_ASSERT(reporter, length == SK_Scalar1 * 4);
     meas.nextContour();
     length = meas.getLength();
     REPORTER_ASSERT(reporter, length == SK_Scalar1);
     SkPoint position;
     SkVector tangent;
     REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
                             -SK_ScalarHalf,
-                            SkFloatToScalar(0.0001f)));
+                            0.0001f));
     REPORTER_ASSERT(reporter, position.fY == 0);
     REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
 
     // Test degenerate paths
     path.reset();
     path.moveTo(0, 0);
     path.lineTo(0, 0);
     path.lineTo(SK_Scalar1, 0);
     path.quadTo(SK_Scalar1, 0, SK_Scalar1, 0);
     path.quadTo(SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1 * 2);
     path.cubicTo(SK_Scalar1, SK_Scalar1 * 2,
                  SK_Scalar1, SK_Scalar1 * 2,
                  SK_Scalar1, SK_Scalar1 * 2);
     path.cubicTo(SK_Scalar1*2, SK_Scalar1 * 2,
                  SK_Scalar1*3, SK_Scalar1 * 2,
                  SK_Scalar1*4, SK_Scalar1 * 2);
     meas.setPath(&path, false);
     length = meas.getLength();
     REPORTER_ASSERT(reporter, length == SK_Scalar1 * 6);
     REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
                             SK_ScalarHalf,
-                            SkFloatToScalar(0.0001f)));
+                            0.0001f));
     REPORTER_ASSERT(reporter, position.fY == 0);
     REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
-    REPORTER_ASSERT(reporter, meas.getPosTan(SkFloatToScalar(2.5f), &position, &tangent));
+    REPORTER_ASSERT(reporter, meas.getPosTan(2.5f, &position, &tangent));
     REPORTER_ASSERT(reporter,
-        SkScalarNearlyEqual(position.fX, SK_Scalar1, SkFloatToScalar(0.0001f)));
+        SkScalarNearlyEqual(position.fX, SK_Scalar1, 0.0001f));
     REPORTER_ASSERT(reporter,
-        SkScalarNearlyEqual(position.fY, SkFloatToScalar(1.5f)));
+        SkScalarNearlyEqual(position.fY, 1.5f));
     REPORTER_ASSERT(reporter, tangent.fX == 0);
     REPORTER_ASSERT(reporter, tangent.fY == SK_Scalar1);
-    REPORTER_ASSERT(reporter, meas.getPosTan(SkFloatToScalar(4.5f), &position, &tangent));
+    REPORTER_ASSERT(reporter, meas.getPosTan(4.5f, &position, &tangent));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
-                            SkFloatToScalar(2.5f),
-                            SkFloatToScalar(0.0001f)));
+                            2.5f,
+                            0.0001f));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fY,
-                            SkFloatToScalar(2.0f),
-                            SkFloatToScalar(0.0001f)));
+                            2.0f,
+                            0.0001f));
     REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
 
     path.reset();
     path.moveTo(0, 0);
     path.lineTo(SK_Scalar1, 0);
     path.moveTo(SK_Scalar1, SK_Scalar1);
     path.moveTo(SK_Scalar1 * 2, SK_Scalar1 * 2);
     path.lineTo(SK_Scalar1, SK_Scalar1 * 2);
     meas.setPath(&path, false);
     length = meas.getLength();
     REPORTER_ASSERT(reporter, length == SK_Scalar1);
     REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
                             SK_ScalarHalf,
-                            SkFloatToScalar(0.0001f)));
+                            0.0001f));
     REPORTER_ASSERT(reporter, position.fY == 0);
     REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
     meas.nextContour();
     length = meas.getLength();
     REPORTER_ASSERT(reporter, length == SK_Scalar1);
     REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fX,
-                            SkFloatToScalar(1.5f),
-                            SkFloatToScalar(0.0001f)));
+                            1.5f,
+                            0.0001f));
     REPORTER_ASSERT(reporter,
         SkScalarNearlyEqual(position.fY,
-                            SkFloatToScalar(2.0f),
-                            SkFloatToScalar(0.0001f)));
+                            2.0f,
+                            0.0001f));
     REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
 
     test_small_segment();
     test_small_segment2();
     test_small_segment3();
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("PathMeasure", PathMeasureTestClass, TestPathMeasure)