diff options
| author |  senorblanco <senorblanco@chromium.org> | 2016-01-21 09:55:47 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-21 09:55:47 -0800 |
| commit | 00502373c8d38b091fe1b9ba15b8510bcc0375bc (patch) | |
| tree | 6ea7daea6d98946db72c36ee8e946573b7729600 /src | |
| parent | ba6ada74e8658571c451f375b3e7736da83ea578 (diff) | |
Fix bounds computations for SkDisplacementMapEffect with negative scale.
BUG=skia:4835
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1616663003
Review URL: https://codereview.chromium.org/1616663003
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 9c640e3a98..30f980a5c6 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -269,7 +269,7 @@ void SkDisplacementMapEffect::computeFastBounds(const SkRect& src, SkRect* dst) } else { *dst = src; } - dst->outset(fScale * SK_ScalarHalf, fScale * SK_ScalarHalf); + dst->outset(SkScalarAbs(fScale) * SK_ScalarHalf, SkScalarAbs(fScale) * SK_ScalarHalf); } void SkDisplacementMapEffect::onFilterNodeBounds(const SkIRect& src, const SkMatrix& ctm, @@ -277,8 +277,8 @@ void SkDisplacementMapEffect::onFilterNodeBounds(const SkIRect& src, const SkMat *dst = src; SkVector scale = SkVector::Make(fScale, fScale); ctm.mapVectors(&scale, 1); - dst->outset(SkScalarCeilToInt(scale.fX * SK_ScalarHalf), - SkScalarCeilToInt(scale.fY * SK_ScalarHalf)); + dst->outset(SkScalarCeilToInt(SkScalarAbs(scale.fX) * SK_ScalarHalf), + SkScalarCeilToInt(SkScalarAbs(scale.fY) * SK_ScalarHalf)); } bool SkDisplacementMapEffect::onFilterBounds(const SkIRect& src, const SkMatrix& ctm, |