Fix a bug in calculation of the background color for 32bpp -> 1bpp color translations.
Fixes bug 2372

svn path=/trunk/; revision=50605
This commit is contained in:
Timo Kreuzer 2011-02-04 13:53:49 +00:00
parent 66cff693af
commit 92d036f574

View file

@ -91,7 +91,7 @@ EXLATEOBJ_iXlateRGBto555(PEXLATEOBJ pxlo, ULONG iColor)
iColor >>= 13;
iNewColor |= iColor & 0x3E0;
/* Copy green */
/* Copy blue */
iColor >>= 13;
iNewColor |= iColor & 0x1F;
@ -417,11 +417,11 @@ EXLATEOBJ_vInitialize(
pexlo->aulXlate[0] =
PALETTE_ulGetNearestPaletteIndex(ppalSrc, crSrcBackColor);
}
else if (ppalSrc->flFlags & PAL_BGR)
else if (ppalSrc->flFlags & PAL_RGB)
{
pexlo->aulXlate[0] = crSrcBackColor;
}
else if (ppalSrc->flFlags & PAL_RGB)
else if (ppalSrc->flFlags & PAL_BGR)
{
pexlo->aulXlate[0] = RGB(GetBValue(crSrcBackColor),
GetGValue(crSrcBackColor),