remove SkFloatToScalar macro

gm/convexpaths.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 "gm.h"
 #include "SkRandom.h"
 #include "SkTArray.h"
@@ skipping 158 matching lines @@
                               30 * SK_Scalar1, SK_Scalar1,
                               20 * SK_Scalar1, 0);
 
         // flat cubic where initial tangent is out, end tangent in
         fPaths.push_back().moveTo(10 * SK_Scalar1, 0);
         fPaths.back().cubicTo(0, SK_Scalar1,
                               20 * SK_Scalar1, SK_Scalar1,
                               30 * SK_Scalar1, 0);
 
         // triangle where one edge is a degenerate quad
-        fPaths.push_back().moveTo(SkFloatToScalar(8.59375f), 45 * SK_Scalar1);
-        fPaths.back().quadTo(SkFloatToScalar(16.9921875f),   45 * SK_Scalar1,
-                             SkFloatToScalar(31.25f),        45 * SK_Scalar1);
+        fPaths.push_back().moveTo(8.59375f, 45 * SK_Scalar1);
+        fPaths.back().quadTo(16.9921875f,   45 * SK_Scalar1,
+                             31.25f,        45 * SK_Scalar1);
         fPaths.back().lineTo(100 * SK_Scalar1,              100 * SK_Scalar1);
-        fPaths.back().lineTo(SkFloatToScalar(8.59375f),      45 * SK_Scalar1);
+        fPaths.back().lineTo(8.59375f,      45 * SK_Scalar1);
 
         // triangle where one edge is a quad with a repeated point
         fPaths.push_back().moveTo(0, 25 * SK_Scalar1);
         fPaths.back().lineTo(50 * SK_Scalar1, 0);
         fPaths.back().quadTo(50 * SK_Scalar1, 50 * SK_Scalar1, 50 * SK_Scalar1, 50 * SK_Scalar1);
 
         // triangle where one edge is a cubic with a 2x repeated point
         fPaths.push_back().moveTo(0, 25 * SK_Scalar1);
         fPaths.back().lineTo(50 * SK_Scalar1, 0);
         fPaths.back().cubicTo(50 * SK_Scalar1, 0,
                               50 * SK_Scalar1, 50 * SK_Scalar1,
                               50 * SK_Scalar1, 50 * SK_Scalar1);
 
         // triangle where one edge is a quad with a nearly repeated point
         fPaths.push_back().moveTo(0, 25 * SK_Scalar1);
         fPaths.back().lineTo(50 * SK_Scalar1, 0);
-        fPaths.back().quadTo(50 * SK_Scalar1, SkFloatToScalar(49.95f),
+        fPaths.back().quadTo(50 * SK_Scalar1, 49.95f,
                              50 * SK_Scalar1, 50 * SK_Scalar1);
 
         // triangle where one edge is a cubic with a 3x nearly repeated point
         fPaths.push_back().moveTo(0, 25 * SK_Scalar1);
         fPaths.back().lineTo(50 * SK_Scalar1, 0);
-        fPaths.back().cubicTo(50 * SK_Scalar1, SkFloatToScalar(49.95f),
-                              50 * SK_Scalar1, SkFloatToScalar(49.97f),
+        fPaths.back().cubicTo(50 * SK_Scalar1, 49.95f,
+                              50 * SK_Scalar1, 49.97f,
                               50 * SK_Scalar1, 50 * SK_Scalar1);
 
         // triangle where there is a point degenerate cubic at one corner
         fPaths.push_back().moveTo(0, 25 * SK_Scalar1);
         fPaths.back().lineTo(50 * SK_Scalar1, 0);
         fPaths.back().lineTo(50 * SK_Scalar1, 50 * SK_Scalar1);
         fPaths.back().cubicTo(50 * SK_Scalar1, 50 * SK_Scalar1,
                               50 * SK_Scalar1, 50 * SK_Scalar1,
                               50 * SK_Scalar1, 50 * SK_Scalar1);
 
@@ skipping 28 matching lines @@
         fPaths.push_back().quadTo(100 * SK_Scalar1, 100 * SK_Scalar1,
                                   50 * SK_Scalar1, 50 * SK_Scalar1);
         fPaths.push_back().quadTo(50 * SK_Scalar1, 50 * SK_Scalar1,
                                   100 * SK_Scalar1, 100 * SK_Scalar1);
         fPaths.push_back().cubicTo(0, 0,
                                    0, 0,
                                    100 * SK_Scalar1, 100 * SK_Scalar1);
 
         // small circle. This is listed last so that it has device coords far
         // from the origin (small area relative to x,y values).
-        fPaths.push_back().addCircle(0, 0, SkFloatToScalar(1.2f));
+        fPaths.push_back().addCircle(0, 0, 1.2f);
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         this->makePaths();
 
     SkPaint paint;
     paint.setAntiAlias(true);
     SkLCGRandom rand;
     canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
 
@@ skipping 21 matching lines @@
     typedef GM INHERITED;
     SkTArray<SkPath> fPaths;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ConvexPathsGM; }
 static GMRegistry reg(MyFactory);
 
 }