gdi32: Initialise the bit fields even in the BI_RGB case in order to make format comparisons easier.

This commit is contained in:
Huw Davies 2011-05-11 15:13:40 +01:00 committed by Alexandre Julliard
parent 64cf208040
commit 93349f02ad
1 changed files with 8 additions and 7 deletions

View File

@ -76,6 +76,8 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields)
static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits)
{
static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff};
dib->bit_count = bi->biBitCount;
dib->width = bi->biWidth;
dib->height = bi->biHeight;
@ -99,15 +101,14 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit
{
case 32:
if(bi->biCompression == BI_RGB)
bit_fields = bit_fields_888;
init_bit_fields(dib, bit_fields);
if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff)
dib->funcs = &funcs_8888;
else
{
init_bit_fields(dib, bit_fields);
if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff)
dib->funcs = &funcs_8888;
else
dib->funcs = &funcs_32;
}
dib->funcs = &funcs_32;
break;
default: