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

gdi32: Move initialization of a correct BITMAPINFOHEADER to a separate function.

This commit is contained in:
Alexandre Julliard 2011-08-04 14:37:20 +02:00
parent f825f5db8c
commit f234ce9dcc
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
dlls/gdi32/dib.c
View File

@ -135,60 +135,64 @@ int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width,
}
/*******************************************************************************************
* Fill out a true BITMAPINFO from a variable sized BITMAPINFO / BITMAPCOREINFO.
* Fill out a true BITMAPINFOHEADER from a variable sized BITMAPINFOHEADER / BITMAPCOREHEADER.
*/
static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *info, UINT coloruse )
static BOOL bitmapinfoheader_from_user_bitmapinfo( BITMAPINFOHEADER *dst, const BITMAPINFOHEADER *info )
{
LONG width, height;
WORD planes, bpp;
DWORD compr, size;
void *src_colors;
unsigned int colors;
int bitmap_type = DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, &planes, &bpp, &compr, &size );
int bitmap_type = DIB_GetBitmapInfo( info, &width, &height, &planes, &bpp, &compr, &size );
if (bitmap_type == -1) return FALSE;
src_colors = (char *)info + info->bmiHeader.biSize;
if (bitmap_type == 1)
{
dst->bmiHeader = info->bmiHeader;
dst->bmiHeader.biSize = sizeof(dst->bmiHeader);
*dst = *info;
}
else
{
dst->biWidth = width;
dst->biHeight = height;
dst->biPlanes = planes;
dst->biBitCount = bpp;
dst->biCompression = compr;
dst->biXPelsPerMeter = 0;
dst->biYPelsPerMeter = 0;
dst->biClrUsed = 0;
dst->biClrImportant = 0;
}
dst->biSize = sizeof(*dst);
if (dst->biCompression == BI_RGB || dst->biCompression == BI_BITFIELDS)
dst->biSizeImage = get_dib_image_size( (BITMAPINFO *)dst );
return TRUE;
}
/*******************************************************************************************
* Fill out a true BITMAPINFO from a variable sized BITMAPINFO / BITMAPCOREINFO.
*/
static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *info, UINT coloruse )
{
void *src_colors;
unsigned int colors;
if (!bitmapinfoheader_from_user_bitmapinfo( &dst->bmiHeader, &info->bmiHeader )) return FALSE;
src_colors = (char *)info + info->bmiHeader.biSize;
colors = get_dib_num_of_colors( dst );
if (info->bmiHeader.biCompression == BI_BITFIELDS)
{
/* bitfields are always at bmiColors even in larger structures */
memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) );
}
else if (colors)
{
unsigned int size;
if (coloruse == DIB_PAL_COLORS)
size = colors * sizeof(WORD);
else
size = colors * sizeof(RGBQUAD);
memcpy( dst->bmiColors, src_colors, size );
}
}
else
{
dst->bmiHeader.biSize = sizeof(dst->bmiHeader);
dst->bmiHeader.biWidth = width;
dst->bmiHeader.biHeight = height;
dst->bmiHeader.biPlanes = planes;
dst->bmiHeader.biBitCount = bpp;
dst->bmiHeader.biCompression = compr;
dst->bmiHeader.biXPelsPerMeter = 0;
dst->bmiHeader.biYPelsPerMeter = 0;
dst->bmiHeader.biClrUsed = 0;
dst->bmiHeader.biClrImportant = 0;
colors = get_dib_num_of_colors( dst );
if (colors)
{
if (coloruse == DIB_PAL_COLORS)
memcpy( dst->bmiColors, src_colors, colors * sizeof(WORD) );
else if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER))
memcpy( dst->bmiColors, src_colors, colors * sizeof(RGBQUAD) );
else
{
unsigned int i;
@ -202,10 +206,6 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *
}
}
}
}
if (dst->bmiHeader.biCompression == BI_RGB || dst->bmiHeader.biCompression == BI_BITFIELDS)
dst->bmiHeader.biSizeImage = get_dib_image_size( dst );
return TRUE;
}