remove SkFloatToScalar macro

gm/imagefiltersgraph.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 "SkArithmeticMode.h"
@@ skipping 122 matching lines @@
             paint.setImageFilter(merge);
             canvas->drawPaint(paint);
             canvas->translate(SkIntToScalar(100), 0);
         }
         {
             SkAutoTUnref<SkImageFilter> morph(new SkDilateImageFilter(5, 5));
 
             SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0,
                                     0, SK_Scalar1, 0, 0, 0,
                                     0, 0, SK_Scalar1, 0, 0,
-                                    0, 0, 0, SkFloatToScalar(0.5f), 0 };
+                                    0, 0, 0, 0.5f, 0 };
 
             SkAutoTUnref<SkColorFilter> matrixFilter(new SkColorMatrixFilter(matrix));
             SkAutoTUnref<SkImageFilter> colorMorph(SkColorFilterImageFilter::Create(matrixFilter, morph));
             SkAutoTUnref<SkXfermode> mode(SkXfermode::Create(SkXfermode::kSrcOver_Mode));
             SkAutoTUnref<SkImageFilter> blendColor(new SkXfermodeImageFilter(mode, colorMorph));
 
             SkPaint paint;
             paint.setImageFilter(blendColor);
             drawClippedBitmap(canvas, fBitmap, paint);
             canvas->translate(SkIntToScalar(100), 0);
         }
         {
             SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0,
                                     0, SK_Scalar1, 0, 0, 0,
                                     0, 0, SK_Scalar1, 0, 0,
-                                    0, 0, 0, SkFloatToScalar(0.5f), 0 };
+                                    0, 0, 0, 0.5f, 0 };
             SkColorMatrixFilter matrixCF(matrix);
             SkAutoTUnref<SkImageFilter> matrixFilter(SkColorFilterImageFilter::Create(&matrixCF));
             SimpleOffsetFilter offsetFilter(SkIntToScalar(10), SkIntToScalar(10), matrixFilter);
 
             SkAutoTUnref<SkXfermode> arith(SkArithmeticMode::Create(0, SK_Scalar1, SK_Scalar1, 0));
             SkXfermodeImageFilter arithFilter(arith, matrixFilter, &offsetFilter);
 
             SkPaint paint;
             paint.setImageFilter(&arithFilter);
             drawClippedBitmap(canvas, fBitmap, paint);
@@ skipping 17 matching lines @@
 private:
     typedef GM INHERITED;
     SkBitmap fBitmap;
     bool fInitialized;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersGraphGM; }
 static skiagm::GMRegistry reg(MyFactory);