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

make the same prerounding fix for the shadeSpan16 case

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@213 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@android.com 2009-06-12 20:09:24 +00:00
parent c552a43c7f
commit b2c5f2d260
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/effects/SkGradientShader.cpp
View File

@ -794,25 +794,23 @@ void Linear_Gradient::shadeSpan16(int x, int y, uint16_t dstC[], int count)
int toggle = ((x ^ y) & 1) << kCache16Bits; int toggle = ((x ^ y) & 1) << kCache16Bits;
#endif #endif
if (fDstToIndexClass != kPerspective_MatrixClass) if (fDstToIndexClass != kPerspective_MatrixClass) {
{
dstProc(fDstToIndex, SkIntToScalar(x), SkIntToScalar(y), &srcPt); dstProc(fDstToIndex, SkIntToScalar(x), SkIntToScalar(y), &srcPt);
SkFixed dx, fx = SkScalarToFixed(srcPt.fX); SkFixed dx, fx = SkScalarToFixed(srcPt.fX);
// preround fx by half the amount we throw away
fx += 1 << 7;
if (fDstToIndexClass == kFixedStepInX_MatrixClass) if (fDstToIndexClass == kFixedStepInX_MatrixClass) {
{
SkFixed dxStorage[1]; SkFixed dxStorage[1];
(void)fDstToIndex.fixedStepInX(SkIntToScalar(y), dxStorage, NULL); (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), dxStorage, NULL);
dx = dxStorage[0]; dx = dxStorage[0];
} } else {
else
{
SkASSERT(fDstToIndexClass == kLinear_MatrixClass); SkASSERT(fDstToIndexClass == kLinear_MatrixClass);
dx = SkScalarToFixed(fDstToIndex.getScaleX()); dx = SkScalarToFixed(fDstToIndex.getScaleX());
} }
if (SkFixedNearlyZero(dx)) // we're a vertical gradient, so no change in a span if (SkFixedNearlyZero(dx)) {
{ // we're a vertical gradient, so no change in a span
unsigned fi = proc(fx) >> 10; unsigned fi = proc(fx) >> 10;
SkASSERT(fi <= 63); SkASSERT(fi <= 63);
#ifdef TEST_GRADIENT_DITHER #ifdef TEST_GRADIENT_DITHER
@ -820,9 +818,7 @@ void Linear_Gradient::shadeSpan16(int x, int y, uint16_t dstC[], int count)
#else #else
sk_memset16(dstC, cache[fi], count); sk_memset16(dstC, cache[fi], count);
#endif #endif
} } else if (proc == clamp_tileproc) {
else if (proc == clamp_tileproc)
{
do { do {
unsigned fi = SkClampMax(fx >> 10, 63); unsigned fi = SkClampMax(fx >> 10, 63);
SkASSERT(fi <= 63); SkASSERT(fi <= 63);
@ -834,9 +830,7 @@ void Linear_Gradient::shadeSpan16(int x, int y, uint16_t dstC[], int count)
*dstC++ = cache[fi]; *dstC++ = cache[fi];
#endif #endif
} while (--count != 0); } while (--count != 0);
} } else if (proc == mirror_tileproc) {
else if (proc == mirror_tileproc)
{
do { do {
unsigned fi = mirror_6bits(fx >> 10); unsigned fi = mirror_6bits(fx >> 10);
SkASSERT(fi <= 0x3F); SkASSERT(fi <= 0x3F);
@ -848,9 +842,7 @@ void Linear_Gradient::shadeSpan16(int x, int y, uint16_t dstC[], int count)
*dstC++ = cache[fi]; *dstC++ = cache[fi];
#endif #endif
} while (--count != 0); } while (--count != 0);
} } else {
else
{
SkASSERT(proc == repeat_tileproc); SkASSERT(proc == repeat_tileproc);
do { do {
unsigned fi = repeat_6bits(fx >> 10); unsigned fi = repeat_6bits(fx >> 10);
@ -864,9 +856,7 @@ void Linear_Gradient::shadeSpan16(int x, int y, uint16_t dstC[], int count)
#endif #endif
} while (--count != 0); } while (--count != 0);
} }
} } else {
else
{
SkScalar dstX = SkIntToScalar(x); SkScalar dstX = SkIntToScalar(x);
SkScalar dstY = SkIntToScalar(y); SkScalar dstY = SkIntToScalar(y);
do { do {