remove SkFloatToScalar macro

src/core/SkBitmapFilter.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkErrorInternals.h"
 #include "SkConvolver.h"
 #include "SkBitmapProcState.h"
@@ skipping 13 matching lines @@
 
 namespace {
 
 template <typename Color, typename ColorPacker>
 void highQualityFilter(ColorPacker pack, const SkBitmapProcState& s, int x, int y, Color* SK_RESTRICT colors, int count) {
     const int maxX = s.fBitmap->width() - 1;
     const int maxY = s.fBitmap->height() - 1;
 
     while (count-- > 0) {
         SkPoint srcPt;
-        s.fInvProc(s.fInvMatrix, SkFloatToScalar(x + 0.5f),
-                    SkFloatToScalar(y + 0.5f), &srcPt);
+        s.fInvProc(s.fInvMatrix, x + 0.5f,
+                    y + 0.5f, &srcPt);
         srcPt.fX -= SK_ScalarHalf;
         srcPt.fY -= SK_ScalarHalf;
 
         SkScalar weight = 0;
         SkScalar fr = 0, fg = 0, fb = 0, fa = 0;
 
         int y0 = SkClampMax(SkScalarCeilToInt(srcPt.fY-s.getBitmapFilter()->width()), maxY);
         int y1 = SkClampMax(SkScalarFloorToInt(srcPt.fY+s.getBitmapFilter()->width()), maxY);
         int x0 = SkClampMax(SkScalarCeilToInt(srcPt.fX-s.getBitmapFilter()->width()), maxX);
         int x1 = SkClampMax(SkScalarFloorToInt(srcPt.fX+s.getBitmapFilter()->width()), maxX);
@@ skipping 93 matching lines @@
     }
 
     if (fInvType & SkMatrix::kScale_Mask) {
         fShaderProc32 = highQualityFilter32;
         fShaderProc16 = highQualityFilter16;
         return true;
     } else {
         return false;
     }
 }