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

gdi32: Always set biClrUsed in internal BITMAPINFO structures.

This commit is contained in:
Alexandre Julliard 2011-09-07 12:07:15 +02:00
parent 9e50294f23
commit f4e9bdb904
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/gdi32/dib.c
View File

@ -203,6 +203,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *
dst->bmiColors[i].rgbReserved = 0; dst->bmiColors[i].rgbReserved = 0;
} }
} }
dst->bmiHeader.biClrUsed = colors;
} }
return TRUE; return TRUE;
} }
@ -995,6 +996,7 @@ static void fill_default_color_table( BITMAPINFO *info )
default: default:
ERR("called with bitcount %d\n", info->bmiHeader.biBitCount); ERR("called with bitcount %d\n", info->bmiHeader.biBitCount);
} }
info->bmiHeader.biClrUsed = 1 << info->bmiHeader.biBitCount;
} }
void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info )
@ -1180,10 +1182,7 @@ INT WINAPI GetDIBits(
/* fill out the src colour table, if it needs one */ /* fill out the src colour table, if it needs one */
if (src_info->bmiHeader.biBitCount <= 8 && src_info->bmiHeader.biClrUsed == 0) if (src_info->bmiHeader.biBitCount <= 8 && src_info->bmiHeader.biClrUsed == 0)
{
fill_default_color_table( src_info ); fill_default_color_table( src_info );
src_info->bmiHeader.biClrUsed = 1 << src_info->bmiHeader.biBitCount;
}
/* if the src and dst are the same depth, copy the colour info across */ /* if the src and dst are the same depth, copy the colour info across */
if (dst_info->bmiHeader.biBitCount == src_info->bmiHeader.biBitCount && coloruse == DIB_RGB_COLORS ) if (dst_info->bmiHeader.biBitCount == src_info->bmiHeader.biBitCount && coloruse == DIB_RGB_COLORS )

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

@ -664,6 +664,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info )
case 8: case 8:
{ {
RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize);
if (!info->bmiHeader.biClrUsed) return FALSE;
if (dib->color_table_size != get_dib_num_of_colors( info )) return FALSE; if (dib->color_table_size != get_dib_num_of_colors( info )) 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) );
} }