From 7938bae14af94c1d48d122a2d686e123b66411a7 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 18 Oct 2013 20:08:14 +0000 Subject: Implement crop rect support for SkMatrixConvolutionImageFilter. R=bsalomon@google.com Review URL: https://codereview.chromium.org/27471002 git-svn-id: http://skia.googlecode.com/svn/trunk@11863 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/matrixconvolution.cpp | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) (limited to 'gm/matrixconvolution.cpp') diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index 853b57be07..5c443da3ff 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -44,10 +44,12 @@ protected: } virtual SkISize onISize() { - return make_isize(400, 300); + return make_isize(500, 300); } - void draw(SkCanvas* canvas, int x, int y, const SkIPoint& target, SkMatrixConvolutionImageFilter::TileMode tileMode, bool convolveAlpha) { + void draw(SkCanvas* canvas, int x, int y, const SkIPoint& target, + SkMatrixConvolutionImageFilter::TileMode tileMode, bool convolveAlpha, + const SkImageFilter::CropRect* cropRect = NULL) { SkScalar kernel[9] = { SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar(-7), SkIntToScalar( 1), @@ -56,15 +58,27 @@ protected: SkISize kernelSize = SkISize::Make(3, 3); SkScalar gain = SkFloatToScalar(0.3f), bias = SkIntToScalar(100); SkPaint paint; - SkAutoTUnref filter(SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize, kernel, gain, bias, target, tileMode, convolveAlpha))); + SkAutoTUnref filter( + SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize, + kernel, + gain, + bias, + target, + tileMode, + convolveAlpha, + NULL, + cropRect))); paint.setImageFilter(filter); canvas->save(); - canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y), - SkIntToScalar(fBitmap.width()), SkIntToScalar(fBitmap.height()))); - canvas->drawBitmap(fBitmap, SkIntToScalar(x), SkIntToScalar(y), &paint); + canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); + canvas->clipRect(SkRect::MakeWH(SkIntToScalar(fBitmap.width()), + SkIntToScalar(fBitmap.height()))); + canvas->drawBitmap(fBitmap, 0, 0, &paint); canvas->restore(); } + typedef SkMatrixConvolutionImageFilter MCIF; + virtual void onDraw(SkCanvas* canvas) { if (!fInitialized) { make_bitmap(); @@ -73,15 +87,20 @@ protected: canvas->clear(0x00000000); SkIPoint target = SkIPoint::Make(1, 0); for (int x = 10; x < 310; x += 100) { - draw(canvas, x, 10, target, SkMatrixConvolutionImageFilter::kClamp_TileMode, true); - draw(canvas, x, 110, target, SkMatrixConvolutionImageFilter::kClampToBlack_TileMode, true); - draw(canvas, x, 210, target, SkMatrixConvolutionImageFilter::kRepeat_TileMode, true); + this->draw(canvas, x, 10, target, MCIF::kClamp_TileMode, true); + this->draw(canvas, x, 110, target, MCIF::kClampToBlack_TileMode, true); + this->draw(canvas, x, 210, target, MCIF::kRepeat_TileMode, true); target.fY++; } target.fY = 1; - draw(canvas, 310, 10, target, SkMatrixConvolutionImageFilter::kClamp_TileMode, false); - draw(canvas, 310, 110, target, SkMatrixConvolutionImageFilter::kClampToBlack_TileMode, false); - draw(canvas, 310, 210, target, SkMatrixConvolutionImageFilter::kRepeat_TileMode, false); + SkImageFilter::CropRect rect(SkRect::MakeXYWH(10, 10, 60, 60)); + this->draw(canvas, 310, 10, target, MCIF::kClamp_TileMode, true, &rect); + this->draw(canvas, 310, 110, target, MCIF::kClampToBlack_TileMode, true, &rect); + this->draw(canvas, 310, 210, target, MCIF::kRepeat_TileMode, true, &rect); + + this->draw(canvas, 410, 10, target, MCIF::kClamp_TileMode, false); + this->draw(canvas, 410, 110, target, MCIF::kClampToBlack_TileMode, false); + this->draw(canvas, 410, 210, target, MCIF::kRepeat_TileMode, false); } private: -- cgit v1.2.3