remove blur radius reinterpretation for now to make rebaselining simpler and avoid significant changes to webkit and JNI -- those come later
BUG=
Review URL: https://codereview.appspot.com/7391043
git-svn-id: http://skia.googlecode.com/svn/trunk@7795 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp
index e2dfd2b..d220a54 100644
--- a/src/effects/SkBlurMask.cpp
+++ b/src/effects/SkBlurMask.cpp
@@ -974,14 +974,6 @@
SkScalarMul( radius, kBlurRadiusFudgeFactor):
radius;
-#ifndef SK_IGNORE_BLUR_RADIUS_CORRECTNESS
- // multiply the given radius by sqrt(2)/2 to convert
- // from (2x) standard deviation to needed box width
- const SkScalar radiusMultiplier = SkFloatToScalar(0.707f);
- SkScalar boxWidth = SkScalarMul(passRadius, radiusMultiplier);
- passRadius = SkScalarMul(boxWidth,SK_ScalarHalf) - SK_ScalarHalf;
-#endif
-
int rx = SkScalarCeil(passRadius);
int outerWeight = 255 - SkScalarRound((SkIntToScalar(rx) - passRadius) * 255);
@@ -1250,10 +1242,8 @@
float radius = SkScalarToFloat( SkScalarMul( provided_radius, kBlurRadiusFudgeFactor ) );
-#ifndef SK_IGNORE_BLUR_RADIUS_CORRECTNESS
- float stddev = SkScalarToFloat( radius ) /2.0f;
- radius = stddev * 1.414f;
-#endif
+ // adjust blur radius to match interpretation from boxfilter code
+ radius = (radius + .5) *2;
profile_size = compute_profile( radius, &profile );