remove SkFloatToScalar macro

tests/MathTest.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 "SkFloatBits.h"
 #include "SkFloatingPoint.h"
@@ skipping 126 matching lines @@
     for (int src = 0; src <= 255; src++) {
         for (int dst = 0; dst <= 255; dst++) {
             for (int a = 0; a <= 31; a++) {
 //                int r0 = blend31(src, dst, a);
 //                int r0 = blend31_round(src, dst, a);
 //                int r0 = blend31_old(src, dst, a);
                 int r0 = blend31_slow(src, dst, a);
 
                 float f = float_blend(src, dst, a / 31.f);
                 int r1 = (int)f;
-                int r2 = SkScalarRoundToInt(SkFloatToScalar(f));
+                int r2 = SkScalarRoundToInt(f);
 
                 if (r0 != r1 && r0 != r2) {
                     SkDebugf("src:%d dst:%d a:%d result:%d float:%g\n",
                                   src,   dst, a,        r0,      f);
                     failed += 1;
                 }
                 if (r0 > 255) {
                     death += 1;
                     SkDebugf("death src:%d dst:%d a:%d result:%d float:%g\n",
                                         src,   dst, a,        r0,      f);
                 }
             }
         }
     }
     SkDebugf("---- failed %d death %d\n", failed, death);
 }
 
 static void test_blend(skiatest::Reporter* reporter) {
     for (int src = 0; src <= 255; src++) {
         for (int dst = 0; dst <= 255; dst++) {
             for (int a = 0; a <= 255; a++) {
                 int r0 = SkAlphaBlend255(src, dst, a);
                 float f1 = float_blend(src, dst, a / 255.f);
-                int r1 = SkScalarRoundToInt(SkFloatToScalar(f1));
+                int r1 = SkScalarRoundToInt(f1);
 
                 if (r0 != r1) {
                     float diff = sk_float_abs(f1 - r1);
                     diff = sk_float_abs(diff - 0.5f);
                     if (diff > (1 / 255.f)) {
 #ifdef SK_DEBUG
                         SkDebugf("src:%d dst:%d a:%d result:%d float:%g\n",
                                  src, dst, a, r0, f1);
 #endif
                         REPORTER_ASSERT(reporter, false);
@@ skipping 573 matching lines @@
     test_divmod<int16_t>(r);
 }
 
 DEF_TEST(divmod_s32, r) {
     test_divmod<int32_t>(r);
 }
 
 DEF_TEST(divmod_s64, r) {
     test_divmod<int64_t>(r);
 }