remove SkFloatToScalar macro

src/effects/SkBlurMask.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBlurMask.h"
 #include "SkMath.h"
 #include "SkTemplates.h"
 #include "SkEndian.h"
 
 
 SkScalar SkBlurMask::ConvertRadiusToSigma(SkScalar radius) {
     // This constant approximates the scaling done in the software path's
     // "high quality" mode, in SkBlurMask::Blur() (1 / sqrt(3)).
     // IMHO, it actually should be 1:  we blur "less" than we should do
     // according to the CSS and canvas specs, simply because Safari does the same.
     // Firefox used to do the same too, until 4.0 where they fixed it.  So at some
     // point we should probably get rid of these scaling constants and rebaseline
     // all the blur tests.
-    static const SkScalar kBLUR_SIGMA_SCALE = SkFloatToScalar(0.57735f);
+    static const SkScalar kBLUR_SIGMA_SCALE = 0.57735f;
 
     return radius ? kBLUR_SIGMA_SCALE * radius + 0.5f : 0.0f;
 }
 
 #define UNROLL_SEPARABLE_LOOPS
 
 /**
  * This function performs a box blur in X, of the given radius.  If the
  * "transpose" parameter is true, it will transpose the pixels on write,
  * such that X and Y are swapped. Reads are always performed from contiguous
@@ skipping 363 matching lines @@
         }
 #undef RIGHT_BORDER_ITER
         SkASSERT(outer_sum == 0 && inner_sum == 0);
     }
     return new_width;
 }
 
 static void get_adjusted_radii(SkScalar passRadius, int *loRadius, int *hiRadius)
 {
     *loRadius = *hiRadius = SkScalarCeil(passRadius);
-    if (SkIntToScalar(*hiRadius) - passRadius > SkFloatToScalar(0.5f)) {
+    if (SkIntToScalar(*hiRadius) - passRadius > 0.5f) {
         *loRadius = *hiRadius - 1;
     }
 }
 
 #include "SkColorPriv.h"
 
 static void merge_src_with_blur(uint8_t dst[], int dstRB,
                                 const uint8_t src[], int srcRB,
                                 const uint8_t blur[], int blurRB,
                                 int sw, int sh) {
@@ skipping 573 matching lines @@
         (void)autoCall.detach();
     }
 
     if (style == kInner_Style) {
         dst->fBounds = src.fBounds; // restore trimmed bounds
         dst->fRowBytes = src.fRowBytes;
     }
 
     return true;
 }