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

windowscodecs: Use the BITMAPINFOHEADER structure to get icon bitcount.

This commit is contained in:
Vincent Povirk 2010-05-06 17:07:39 -05:00 committed by Alexandre Julliard
parent dbf123ba0d
commit 6a36802f26
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/windowscodecs/icoformat.c
View File

@ -189,7 +189,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This)
hr = IStream_Read(This->parent->stream, &bih, sizeof(BITMAPINFOHEADER), &bytesread);
if (FAILED(hr) || bytesread != sizeof(BITMAPINFOHEADER)) goto fail;
if (This->entry.wBitCount <= 8)
if (bih.biBitCount <= 8)
{
/* read the palette */
colorcount = This->entry.bColorCount ? This->entry.bColorCount : 256;
@ -202,7 +202,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This)
bitsSize = bitsStride * height;
/* read the XOR data */
switch (This->entry.wBitCount)
switch (bih.biBitCount)
{
case 1:
{
@ -440,11 +440,11 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This)
break;
}
default:
FIXME("unsupported bitcount: %u\n", This->entry.wBitCount);
FIXME("unsupported bitcount: %u\n", bih.biBitCount);
goto fail;
}
if (This->entry.wBitCount < 32)
if (bih.biBitCount < 32)
{
/* set alpha data based on the AND mask */
UINT andBytesPerRow = (width+31)/32*4;