gdiplus: Make get_palette() usable for generating predefined palettes.

0b40df29 · Dmitry Timoshkov · Alexandre Julliard · f165e272 · 0b40df29
Commit 0b40df29 authored Jul 18, 2012 by Dmitry Timoshkov Committed by Alexandre Julliard Jul 25, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

image.c dlls/gdiplus/image.c +3 -1

No files found.
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -76,7 +76,9 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT
    hr = IWICImagingFactory_CreatePalette(factory, &wic_palette);
    if (hr == S_OK)
    {
-        hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette);
+        hr = WINCODEC_ERR_PALETTEUNAVAILABLE;
+        if (frame)
+            hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette);
        if (hr != S_OK)
        {
            TRACE("using predefined palette %#x\n", palette_type);