AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Sk4fLinearGradient initial interval pinning

Browse Source 
For repeat/mirror mode, fx tiling needs to ensure the value doesn't
collapse to the open interval value due to float arithmetic.

Clamp to the next lower representable value.

BUG=skia:5955
R=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4784

Change-Id: I635394d15a80276e88c18a499f93f3047464f190
Reviewed-on: https://skia-review.googlesource.com/4784
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Florin Malita 2016-11-14 15:54:04 -05:00 committed by Skia Commit-Bot
parent 8622b72cfa
commit 0fdde54982
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/effects/gradients/Sk4fLinearGradient.cpp
View File

@ -92,14 +92,24 @@ SkScalar pinFx<SkShader::kClamp_TileMode>(SkScalar fx) {
template<> template<>
SkScalar pinFx<SkShader::kRepeat_TileMode>(SkScalar fx) { SkScalar pinFx<SkShader::kRepeat_TileMode>(SkScalar fx) {
const SkScalar f = SkScalarFraction(fx); SkScalar f = SkScalarFraction(fx);
return f < 0 ? f + 1 : f; if (f < 0) {
f = SkTMin(f + 1, nextafterf(1, 0));
}
SkASSERT(f >= 0);
SkASSERT(f < 1.0f);
return f;
} }
template<> template<>
SkScalar pinFx<SkShader::kMirror_TileMode>(SkScalar fx) { SkScalar pinFx<SkShader::kMirror_TileMode>(SkScalar fx) {
const SkScalar f = SkScalarMod(fx, 2.0f); SkScalar f = SkScalarMod(fx, 2.0f);
return f < 0 ? f + 2 : f; if (f < 0) {
f = SkTMin(f + 2, nextafterf(2, 0));
}
SkASSERT(f >= 0);
SkASSERT(f < 2.0f);
return f;
} }
// true when x is in [k1,k2), or [k2, k1) when the interval is reversed. // true when x is in [k1,k2), or [k2, k1) when the interval is reversed.