Some small cleanups for image filter code.
Use the 2-param flavour of mapVector instead of the 3-param, where possible.
Add an SkMatrixImageFilter test case to the tiling unit test.
R=junov@chromium.org
Review URL: https://codereview.chromium.org/277543002
git-svn-id: http://skia.googlecode.com/svn/trunk@14630 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp
index 63990ab..00064d4 100644
--- a/src/effects/SkBlurImageFilter.cpp
+++ b/src/effects/SkBlurImageFilter.cpp
@@ -169,8 +169,8 @@
return false;
}
- SkVector sigma, localSigma = SkVector::Make(fSigma.width(), fSigma.height());
- ctx.ctm().mapVectors(&sigma, &localSigma, 1);
+ SkVector sigma = SkVector::Make(fSigma.width(), fSigma.height());
+ ctx.ctm().mapVectors(&sigma, 1);
sigma.fX = SkMinScalar(sigma.fX, MAX_SIGMA);
sigma.fY = SkMinScalar(sigma.fY, MAX_SIGMA);
@@ -249,8 +249,8 @@
if (getInput(0) && !getInput(0)->filterBounds(src, ctm, &bounds)) {
return false;
}
- SkVector sigma, localSigma = SkVector::Make(fSigma.width(), fSigma.height());
- ctm.mapVectors(&sigma, &localSigma, 1);
+ SkVector sigma = SkVector::Make(fSigma.width(), fSigma.height());
+ ctm.mapVectors(&sigma, 1);
bounds.outset(SkScalarCeilToInt(SkScalarMul(sigma.x(), SkIntToScalar(3))),
SkScalarCeilToInt(SkScalarMul(sigma.y(), SkIntToScalar(3))));
*dst = bounds;
@@ -270,8 +270,8 @@
return false;
}
GrTexture* source = input.getTexture();
- SkVector sigma, localSigma = SkVector::Make(fSigma.width(), fSigma.height());
- ctx.ctm().mapVectors(&sigma, &localSigma, 1);
+ SkVector sigma = SkVector::Make(fSigma.width(), fSigma.height());
+ ctx.ctm().mapVectors(&sigma, 1);
sigma.fX = SkMinScalar(sigma.fX, MAX_SIGMA);
sigma.fY = SkMinScalar(sigma.fY, MAX_SIGMA);
offset->fX = rect.fLeft;