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/ClipperTest.cpp

diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index b4eee60..a81e655 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -22,8 +22,8 @@
 
     SkCanvas canvas(bm);
     canvas.clipRect(SkRect::MakeWH(SkIntToScalar(4), SkIntToScalar(2)));
-    canvas.drawLine(SkFloatToScalar(1.5f), SkFloatToScalar(1.5f),
-                    SkFloatToScalar(3.5f), SkFloatToScalar(3.5f), paint);
+    canvas.drawLine(1.5f, 1.5f,
+                    3.5f, 3.5f, paint);
 
     /**
      *  We had a bug where we misinterpreted the bottom of the clip, and
@@ -52,10 +52,10 @@
     SkEdgeClipper clipper;
 
     const SkPoint pts[] = {
-        { SkFloatToScalar(3.0995476e+010f),  SkFloatToScalar(42.929779f) },
-        { SkFloatToScalar(-3.0995163e+010f), SkFloatToScalar(51.050385f) },
-        { SkFloatToScalar(-3.0995157e+010f), SkFloatToScalar(51.050392f) },
-        { SkFloatToScalar(-3.0995134e+010f), SkFloatToScalar(51.050400f) },
+        { 3.0995476e+010f,  42.929779f },
+        { -3.0995163e+010f, 51.050385f },
+        { -3.0995157e+010f, 51.050392f },
+        { -3.0995134e+010f, 51.050400f },
     };
 
     const SkRect clip = { 0, 0, SkIntToScalar(300), SkIntToScalar(200) };