commit 4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 25 19:44:07 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 25 19:44:07 2013 +0000
tree dae12c217068df2844c0ce18fb2c62311ae8c5e9
parent 2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54

remove SkFloatToScalar macro

BUG=
R=reed@google.com, djsollen@google.com

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/85463005

git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/MathTest.cpp

diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index cfb96ad..f5c61cb 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -144,7 +144,7 @@
 
                 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",
@@ -168,7 +168,7 @@
             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);