remove SkFloatToScalar macro

gm/gradients.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 "SkGradientShader.h"
 
@@ skipping 244 matching lines @@
     virtual SkISize onISize() { return SkISize::Make(320, 320); }
 
     void drawBG(SkCanvas* canvas) {
         canvas->drawColor(SK_ColorBLUE);
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         this->drawBG(canvas);
 
         SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorGREEN, SK_ColorRED };
-        SkScalar pos[] = { 0, SkFloatToScalar(0.01f), SkFloatToScalar(0.99f), SK_Scalar1 };
+        SkScalar pos[] = { 0, 0.01f, 0.99f, SK_Scalar1 };
         SkPoint c0;
         c0.iset(-80, 25);
         SkScalar r0 = SkIntToScalar(70);
         SkPoint c1;
         c1.iset(0, 25);
         SkScalar r1 = SkIntToScalar(150);
         SkShader* s = SkGradientShader::CreateTwoPointRadial(c0, r0, c1, r1, colors,
                                                              pos, SK_ARRAY_COUNT(pos),
                                                              SkShader::kClamp_TileMode);
         SkPaint paint;
@@ skipping 60 matching lines @@
         const SkISize dim = this->getISize();
 
         this->drawBG(canvas);
 
         SkPaint paint;
         paint.setDither(true);
         SkPoint center;
         center.set(SkIntToScalar(dim.width())/2, SkIntToScalar(dim.height())/2);
         SkScalar radius = SkIntToScalar(dim.width())/2;
         const SkColor colors[] = { 0x7f7f7f7f, 0x7f7f7f7f, 0xb2000000 };
-        const SkScalar pos[] = { SkFloatToScalar(0.0f),
-                             SkFloatToScalar(0.35f),
-                             SkFloatToScalar(1.0f) };
+        const SkScalar pos[] = { 0.0f,
+                             0.35f,
+                             1.0f };
         SkShader* shader =
             SkGradientShader::CreateRadial(center, radius, colors,
                                            pos, SK_ARRAY_COUNT(pos),
                                            SkShader::kClamp_TileMode);
         paint.setShader(shader)->unref();
         SkRect r = {
             0, 0, SkIntToScalar(dim.width()), SkIntToScalar(dim.height())
         };
         canvas->drawRect(r, paint);
     }
@@ skipping 80 matching lines @@
 
 static GM* MyFactory5(void*) { return new GradientsLocalPerspectiveGM; }
 static GMRegistry reg5(MyFactory5);
 
 static GM* MyFactory6(void*) { return new GradientsViewPerspectiveGM; }
 static GMRegistry reg6(MyFactory6);
 
 static GM* MyFactory7(void*) { return new RadialGradient2GM; }
 static GMRegistry reg7(MyFactory7);
 }