diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:51:29 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:51:29 -0800 |
| commit | a0a3a4d3f7e368311d896eaca0a22732a81d37fb (patch) | |
| tree | c4590b3f4713d99a0f55be9f270231ce56c98779 /src/effects/SkGradientShader.cpp | |
| parent | 93df05afa45a51715db60aa88cc6ea11f232b3ea (diff) | |
| parent | 7cd90d4eecdba0f40a36945749d40df95d6d641b (diff) | |
| download | external_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.zip external_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.tar.gz external_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/skia into mr1-staging
Change-Id: I5cf0639d6ad25f58af4d5e0e480ee063148991f8
Diffstat (limited to 'src/effects/SkGradientShader.cpp')
| -rw-r--r-- | src/effects/SkGradientShader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp index 4bbc96c..24ed445 100644 --- a/src/effects/SkGradientShader.cpp +++ b/src/effects/SkGradientShader.cpp @@ -1046,7 +1046,9 @@ void Linear_Gradient::shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC, } LinearShadeProc shadeProc = shadeSpan_linear_repeat; - if (SkFixedNearlyZero(dx)) { + // We really should check the endpoint colors, but short of that change + // we reduce the tolerance of SkFixedNearlyZero to be more restrictive. + if (SkFixedNearlyZero(dx, (SK_Fixed1 >> 14))) { #ifdef SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS if (fColorCount > 2) { shadeProc = shadeSpan_linear_vertical_lerp; |