remove SkFloatToScalar macro

samplecode/SampleDegenerateTwoPtRadials.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 "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "Sk64.h"
 #include "SkGradientShader.h"
 #include "SkString.h"
 
 static void draw_gradient2(SkCanvas* canvas, const SkRect& rect, SkScalar delta) {
     SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorMAGENTA };
-    SkScalar pos[] = { 0, SkFloatToScalar(0.25f), SkFloatToScalar(0.75f), SK_Scalar1 };
+    SkScalar pos[] = { 0, 0.25f, 0.75f, SK_Scalar1 };
 
     SkScalar l = rect.fLeft;
     SkScalar t = rect.fTop;
     SkScalar w = rect.width();
     SkScalar h = rect.height();
 
     SkASSERT(0 == SkScalarMod(w, SK_Scalar1 * 5));
 
     SkPoint c0 = { l + 2 * w / 5 + delta, t + h / 2 };
     SkPoint c1 = { l + 3 * w / 5, t + h / 2 };
@@ skipping 55 matching lines @@
 
 private:
     SkScalar           fTime;
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new DegenerateTwoPtRadialsView; }
 static SkViewRegister reg(MyFactory);