From e10a4ff45aa4889e1ce3b4caec3f055244832bab Mon Sep 17 00:00:00 2001 From: humper Date: Fri, 6 Jun 2014 12:21:03 -0700 Subject: repair math error introduced by windows build fix BUG=skia: TBR=jvanverth NOTRY=True NOTREECHECKS=True Author: humper@google.com Review URL: https://codereview.chromium.org/320593003 --- src/effects/SkBlurMaskFilter.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/effects') diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 80fa9f8fe4..f5f0ff9f73 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -695,6 +695,9 @@ void GrGLRectBlurEffect::setData(const GrGLUniformManager& uman, uman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom); uman.set1f(fProfileSizeUniform, SkScalarCeilToScalar(6*rbe.getSigma())); + + SkDebugf( "proxy rect set to %f %f %f %f\n", rect.fLeft, rect.fTop, rect.fRight, rect.fBottom); + SkDebugf(" Profile size set to %f\n", SkScalarCeilToScalar(6*rbe.getSigma())); } bool GrRectBlurEffect::CreateBlurProfileTexture(GrContext *context, float sigma, @@ -796,8 +799,8 @@ bool SkBlurMaskFilterImpl::directFilterMaskGPU(GrContext* context, SkMatrix ctm = context->getMatrix(); SkScalar xformedSigma = this->computeXformedSigma(ctm); - float pad=SkScalarCeilToScalar(6*xformedSigma)/2.0f; - rect.outset(pad, pad); + int pad=SkScalarCeilToInt(6*xformedSigma)/2; + rect.outset(SkIntToScalar(pad), SkIntToScalar(pad)); SkAutoTUnref effect(GrRectBlurEffect::Create( context, rect, xformedSigma)); -- cgit v1.2.3