From e1ca705cac4b946993f6cbf798e2a0ba27e739f3 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 17 Dec 2013 19:22:07 +0000 Subject: deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPRECATED_SCALARROUND for legacy clients BUG= R=robertphillips@google.com Review URL: https://codereview.chromium.org/111353003 git-svn-id: http://skia.googlecode.com/svn/trunk@12719 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/SkBlurMask.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/effects/SkBlurMask.cpp') diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp index d2484c84b7..32a3d20d31 100644 --- a/src/effects/SkBlurMask.cpp +++ b/src/effects/SkBlurMask.cpp @@ -404,7 +404,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); + *loRadius = *hiRadius = SkScalarCeilToInt(passRadius); if (SkIntToScalar(*hiRadius) - passRadius > 0.5f) { *loRadius = *hiRadius - 1; } @@ -512,8 +512,8 @@ bool SkBlurMask::BoxBlur(SkMask* dst, const SkMask& src, // to approximate a Gaussian blur int passCount = (kHigh_Quality == quality) ? 3 : 1; - int rx = SkScalarCeil(passRadius); - int outerWeight = 255 - SkScalarRound((SkIntToScalar(rx) - passRadius) * 255); + int rx = SkScalarCeilToInt(passRadius); + int outerWeight = 255 - SkScalarRoundToInt((SkIntToScalar(rx) - passRadius) * 255); SkASSERT(rx >= 0); SkASSERT((unsigned)outerWeight <= 255); @@ -865,7 +865,7 @@ bool SkBlurMask::BlurGroundTruth(SkScalar sigma, SkMask* dst, const SkMask& src, float variance = sigma * sigma; - int windowSize = SkScalarCeil(sigma*6); + int windowSize = SkScalarCeilToInt(sigma*6); // round window size up to nearest odd number windowSize |= 1; -- cgit v1.2.3