From de3aac8cea8a7113f31591e6e02c51fe0ac45280 Mon Sep 17 00:00:00 2001 From: reed Date: Sun, 22 Nov 2015 13:00:04 -0800 Subject: use pinned value during lerp for vertical gradients slight formatting clean up on associated gm BUG=skia: Review URL: https://codereview.chromium.org/1471543002 --- src/effects/gradients/SkLinearGradient.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 013c1f1dde..bfa473c012 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -727,6 +727,9 @@ template void fill(SkPMColor dst[], int count, const Sk4f& c4 */ static Sk4f lerp_color(float fx, const SkLinearGradient::LinearGradientContext::Rec* rec) { + SkASSERT(fx >= rec[0].fPos); + SkASSERT(fx <= rec[1].fPos); + const float p0 = rec[0].fPos; const Sk4f c0 = rec[0].fColor; const Sk4f c1 = rec[1].fColor; @@ -894,7 +897,8 @@ void SkLinearGradient::LinearGradientContext::shade4_clamp(int x, int y, SkPMCol const float invDx = 1 / dx; if (SkScalarNearlyZero(dx)) { // gradient is vertical - Sk4f c = lerp_color(fx, find_forward(fRecs.begin(), SkTPin(fx, 0.0f, 1.0f))); + const float pinFx = SkTPin(fx, 0.0f, 1.0f); + Sk4f c = lerp_color(pinFx, find_forward(fRecs.begin(), pinFx)); if (fApplyAlphaAfterInterp) { fill(dstC, count, c + dither0, c + dither1); } else { -- cgit v1.2.3