ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Improve support of bitmaps without a color table in PutImage.

This commit is contained in:
Alexandre Julliard 2012-05-29 13:53:30 +02:00
parent 50d53928e0
commit c2784e08fc
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/gdi32/dibdrv/bitblt.c
View File

@ -871,16 +871,25 @@ done:
static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info )
{ {
const RGBQUAD *color_table = info->bmiColors;
switch (info->bmiHeader.biBitCount) switch (info->bmiHeader.biBitCount)
{ {
case 1: case 1:
case 4:
case 8:
{
RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize);
if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE;
return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) );
case 4:
case 8:
if (!info->bmiHeader.biClrUsed)
{
if (!dib->color_table_size) return TRUE;
if (dib->color_table_size != 1 << info->bmiHeader.biBitCount) return FALSE;
color_table = get_default_color_table( info->bmiHeader.biBitCount );
} }
else if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE;
return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) );
case 16: case 16:
{ {