Fix xmap regression, when drawing wiz images.

svn-id: r26119
This commit is contained in:
Travis Howell 2007-03-12 23:03:30 +00:00
parent 594296c3e3
commit 1e8047a5d2

View File

@ -553,7 +553,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C
int h, w, xoff, dstInc;
if (type == kWizXMap) {
assert(palPtr != 0 && xmapPtr != 0);
assert(xmapPtr != 0);
}
if (type == kWizRMap) {
assert(palPtr != 0);
@ -619,7 +619,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C
}
while (code--) {
if (type == kWizXMap) {
*dstPtr = xmapPtr[palPtr[*dataPtr] * 256 + *dstPtr];
*dstPtr = xmapPtr[*dataPtr * 256 + *dstPtr];
}
if (type == kWizRMap) {
*dstPtr = palPtr[*dataPtr];
@ -647,7 +647,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C
}
while (code--) {
if (type == kWizXMap) {
*dstPtr = xmapPtr[palPtr[*dataPtr++] * 256 + *dstPtr];
*dstPtr = xmapPtr[*dataPtr++ * 256 + *dstPtr];
}
if (type == kWizRMap) {
*dstPtr = palPtr[*dataPtr++];