remove SkFloatToScalar macro

tests/ClipperTest.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 "SkPath.h"
 #include "SkLineClipper.h"
 #include "SkEdgeClipper.h"
 
 #include "SkCanvas.h"
 static void test_hairclipping(skiatest::Reporter* reporter) {
     SkBitmap bm;
     bm.setConfig(SkBitmap::kARGB_8888_Config, 4, 4);
     bm.allocPixels();
     bm.eraseColor(SK_ColorWHITE);
 
     SkPaint paint;
     paint.setAntiAlias(true);
 
     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
      *  would draw another pixel (to the right in this case) on the same
      *  last scanline. i.e. we would draw to [2,1], even though this hairline
      *  should just draw to [1,1], [2,2], [3,3] modulo the clip.
      *
      *  The result of this entire draw should be that we only draw to [1,1]
      *
      *  Fixed in rev. 3366
      */
     for (int y = 0; y < 4; ++y) {
         for (int x = 0; x < 4; ++x) {
             bool nonWhite = (1 == y) && (1 == x);
             SkPMColor c = *bm.getAddr32(x, y);
             if (nonWhite) {
                 REPORTER_ASSERT(reporter, 0xFFFFFFFF != c);
             } else {
                 REPORTER_ASSERT(reporter, 0xFFFFFFFF == c);
             }
         }
     }
 }
 
 static void test_edgeclipper() {
     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) };
 
     // this should not assert, even though our choppers do a poor numerical
     // job when computing their t values.
     // http://code.google.com/p/skia/issues/detail?id=444
     clipper.clipCubic(pts, clip);
 }
 
@@ skipping 76 matching lines @@
 }
 
 static void TestClipper(skiatest::Reporter* reporter) {
     test_intersectline(reporter);
     test_edgeclipper();
     test_hairclipping(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Clipper", TestClipperClass, TestClipper)