remove SkFloatToScalar macro

gm/roundrects.cpp

 
 /*
  * Copyright 2013 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 "SkTArray.h"
@@ skipping 110 matching lines @@
 
         {
         SkMatrix m;
         m.setRotate(SkIntToScalar(60));
         fMatrices.push_back(m);
         }
     }
 
     SkColor genColor(SkRandom* rand) {
         SkScalar hsv[3];
-        hsv[0] = SkFloatToScalar(rand->nextRangeF(0.0f, 360.0f));
-        hsv[1] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f));
-        hsv[2] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f));
+        hsv[0] = rand->nextRangeF(0.0f, 360.0f);
+        hsv[1] = rand->nextRangeF(0.75f, 1.0f);
+        hsv[2] = rand->nextRangeF(0.75f, 1.0f);
 
         return SkHSVToColor(hsv);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRandom rand(1);
         canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
         SkRect rect = SkRect::MakeLTRB(-20, -30, 20, 30);
         SkRRect circleRect;
         circleRect.setRectXY(rect, 5, 5);
@@ skipping 186 matching lines @@
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new RoundRectGM; }
 static GMRegistry reg(MyFactory);
 
 }