windowscodecs: Fix ICO palette size calculation.

b34f04f9 · Damjan Jovanovic · Alexandre Julliard · 234afb88 · b34f04f9
Commit b34f04f9 authored May 22, 2010 by Damjan Jovanovic Committed by Alexandre Julliard May 24, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

icoformat.c dlls/windowscodecs/icoformat.c +1 -1

No files found.
--- a/dlls/windowscodecs/icoformat.c
+++ b/dlls/windowscodecs/icoformat.c
@@ -192,7 +192,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This)
    if (bih.biBitCount <= 8)
    {
        /* read the palette */
-        colorcount = This->entry.bColorCount ? This->entry.bColorCount : 256;
+        colorcount = bih.biClrUsed ? bih.biClrUsed : 1 << bih.biBitCount;

        hr = IStream_Read(This->parent->stream, colors, sizeof(RGBQUAD)*colorcount, &bytesread);
        if (FAILED(hr) || bytesread != sizeof(RGBQUAD)*colorcount) goto fail;