diff options
| author |  robertphillips <robertphillips@google.com> | 2015-07-23 11:35:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-23 11:35:08 -0700 |
| commit | eb86b55fe997e1f2f902d3d5c599bf6894f0f07c (patch) | |
| tree | 67afc61aa0c3e6ee5edef7407ad25a94e5eac7e5 /src | |
| parent | 29c69793f0201a5f221d6e0f3d41c1adbc4e5656 (diff) | |
Fix variable shadowing in SkMorphologyImageFilter
Review URL: https://codereview.chromium.org/1245883005
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 388dfcd2bc..30ba25159d 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -662,9 +662,9 @@ bool apply_morphology(const SkBitmap& input, SkIRect srcRect = rect; if (radius.fWidth > 0) { - GrTexture* dst = context->textureProvider()->refScratchTexture( + GrTexture* scratch = context->textureProvider()->refScratchTexture( desc, GrTextureProvider::kApprox_ScratchTexMatch); - if (NULL == dst) { + if (NULL == scratch) { return false; } GrDrawContext* dstDrawContext = context->drawContext(); @@ -672,7 +672,7 @@ bool apply_morphology(const SkBitmap& input, return false; } - apply_morphology_pass(dstDrawContext, dst->asRenderTarget(), clip, srcTexture, + apply_morphology_pass(dstDrawContext, scratch->asRenderTarget(), clip, srcTexture, srcRect, dstRect, radius.fWidth, morphType, Gr1DKernelEffect::kX_Direction); SkIRect clearRect = SkIRect::MakeXYWH(dstRect.fLeft, dstRect.fBottom, @@ -680,15 +680,15 @@ bool apply_morphology(const SkBitmap& input, GrColor clearColor = GrMorphologyEffect::kErode_MorphologyType == morphType ? SK_ColorWHITE : SK_ColorTRANSPARENT; - dstDrawContext->clear(dst->asRenderTarget(), &clearRect, clearColor, false); + dstDrawContext->clear(scratch->asRenderTarget(), &clearRect, clearColor, false); - srcTexture.reset(dst); + srcTexture.reset(scratch); srcRect = dstRect; } if (radius.fHeight > 0) { - GrTexture* dst = context->textureProvider()->refScratchTexture(desc, + GrTexture* scratch = context->textureProvider()->refScratchTexture(desc, GrTextureProvider::kApprox_ScratchTexMatch); - if (NULL == dst) { + if (NULL == scratch) { return false; } GrDrawContext* dstDrawContext = context->drawContext(); @@ -696,11 +696,11 @@ bool apply_morphology(const SkBitmap& input, return false; } - apply_morphology_pass(dstDrawContext, dst->asRenderTarget(), clip, srcTexture, + apply_morphology_pass(dstDrawContext, scratch->asRenderTarget(), clip, srcTexture, srcRect, dstRect, radius.fHeight, morphType, Gr1DKernelEffect::kY_Direction); - srcTexture.reset(dst); + srcTexture.reset(scratch); } SkImageFilter::WrapTexture(srcTexture, rect.width(), rect.height(), dst); return true; |