diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-25 19:44:07 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-25 19:44:07 +0000 |
| commit | 4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c (patch) | |
| tree | dae12c217068df2844c0ce18fb2c62311ae8c5e9 /src/effects/SkBlurMask.cpp | |
| parent | 2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54 (diff) | |
remove SkFloatToScalar macro
BUG=
R=reed@google.com, djsollen@google.com
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/85463005
git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkBlurMask.cpp')
| -rw-r--r-- | src/effects/SkBlurMask.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp index 97a623426b..d2484c84b7 100644 --- a/src/effects/SkBlurMask.cpp +++ b/src/effects/SkBlurMask.cpp @@ -21,7 +21,7 @@ SkScalar SkBlurMask::ConvertRadiusToSigma(SkScalar radius) { // 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; } @@ -405,7 +405,7 @@ static int boxBlurInterp(const uint8_t* src, int src_y_stride, uint8_t* dst, 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; } } |