remove SkFloatToScalar macro

gm/matrixconvolution.cpp

 /*
  * Copyright 2012 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 "SkColor.h"
 #include "SkMatrixConvolutionImageFilter.h"
@@ skipping 38 matching lines @@
 
     void draw(SkCanvas* canvas, int x, int y, const SkIPoint& target,
               SkMatrixConvolutionImageFilter::TileMode tileMode, bool convolveAlpha,
               const SkImageFilter::CropRect* cropRect = NULL) {
         SkScalar kernel[9] = {
             SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
             SkIntToScalar( 1), SkIntToScalar(-7), SkIntToScalar( 1),
             SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
         };
         SkISize kernelSize = SkISize::Make(3, 3);
-        SkScalar gain = SkFloatToScalar(0.3f), bias = SkIntToScalar(100);
+        SkScalar gain = 0.3f, bias = SkIntToScalar(100);
         SkPaint paint;
         SkAutoTUnref<SkImageFilter> filter(
             SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize,
                                                         kernel,
                                                         gain,
                                                         bias,
                                                         target,
                                                         tileMode,
                                                         convolveAlpha,
                                                         NULL,
@@ skipping 38 matching lines @@
     SkBitmap fBitmap;
     bool fInitialized;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new MatrixConvolutionGM; }
 static GMRegistry reg(MyFactory);
 
 }