remove SkFloatToScalar macro

gm/colorfilterimagefilter.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 "SkCanvas.h"
 #include "SkColorMatrixFilter.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 
 #include "SkBlurImageFilter.h"
 #include "SkColorFilterImageFilter.h"
 
 #define FILTER_WIDTH    SkIntToScalar(30)
 #define FILTER_HEIGHT   SkIntToScalar(30)
 #define MARGIN          SkIntToScalar(10)
 
 static SkImageFilter* make_blur(float amount, SkImageFilter* input = NULL) {
     return new SkBlurImageFilter(amount, amount, input);
 }
 
 static SkImageFilter* make_brightness(float amount, SkImageFilter* input = NULL) {
-    SkScalar amount255 = SkScalarMul(SkFloatToScalar(amount), SkIntToScalar(255));
+    SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255));
     SkScalar matrix[20] = { 1, 0, 0, 0, amount255,
                             0, 1, 0, 0, amount255,
                             0, 0, 1, 0, amount255,
                             0, 0, 0, 1, 0 };
     SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix));
     return SkColorFilterImageFilter::Create(filter, input);
 }
 
 static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) {
     SkScalar matrix[20];
     memset(matrix, 0, 20 * sizeof(SkScalar));
-    matrix[0] = matrix[5] = matrix[10] = SkFloatToScalar(0.2126f);
-    matrix[1] = matrix[6] = matrix[11] = SkFloatToScalar(0.7152f);
-    matrix[2] = matrix[7] = matrix[12] = SkFloatToScalar(0.0722f);
-    matrix[18] = SkFloatToScalar(1.0f);
+    matrix[0] = matrix[5] = matrix[10] = 0.2126f;
+    matrix[1] = matrix[6] = matrix[11] = 0.7152f;
+    matrix[2] = matrix[7] = matrix[12] = 0.0722f;
+    matrix[18] = 1.0f;
     SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix));
     return SkColorFilterImageFilter::Create(filter, input);
 }
 
 static SkImageFilter* make_mode_blue(SkImageFilter* input = NULL) {
     SkAutoTUnref<SkColorFilter> filter(
         SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
     return SkColorFilterImageFilter::Create(filter, input);
 }
 
 class ColorFilterImageFilterGM : public skiagm::GM {
 public:
     ColorFilterImageFilterGM () {}
 
 protected:
 
     virtual SkString onShortName() {
         return SkString("colorfilterimagefilter");
     }
 
     void drawClippedRect(SkCanvas* canvas, const SkRect& r, const SkPaint& paint, float outset = 0.0f) {
         canvas->save();
         SkRect clip(r);
-        clip.outset(SkFloatToScalar(outset), SkFloatToScalar(outset));
+        clip.outset(outset, outset);
         canvas->clipRect(clip);
         canvas->drawRect(r, paint);
         canvas->restore();
     }
 
     virtual SkISize onISize() { return SkISize::Make(400, 100); }
 
     virtual void onDraw(SkCanvas* canvas) {
 
         SkRect r = SkRect::MakeWH(FILTER_WIDTH, FILTER_HEIGHT);
@@ skipping 47 matching lines @@
     }
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ColorFilterImageFilterGM; }
 static skiagm::GMRegistry reg(MyFactory);