commit a0f9a251f94ef21b5af63d01f9120f30a71e8c22
author Dmitry Timoshkov <dmitry@baikal.ru> Mon Jul 16 14:54:32 2012 +0900
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 16 15:21:47 2012 +0200
tree 33bf2bf11388b0dd7ef8caabd7e9a0498ee0fda0
parent a9d0f8976ca0d057f0f76adc578e7b9512413c44

windowscodecs: Use predefined WICBitmapPaletteTypeFixedBW palette instead of a hand-made one.

dlls/windowscodecs/converter.c

diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c
index 98e727e..6ee3a16 100644
--- a/dlls/windowscodecs/converter.c
+++ b/dlls/windowscodecs/converter.c
@@ -103,24 +103,19 @@
             IWICPalette *palette;
             UINT actualcolors;
 
+            res = PaletteImpl_Create(&palette);
+            if (FAILED(res)) return res;
+
             if (source_format == format_1bppIndexed)
-            {
-                res = PaletteImpl_Create(&palette);
-                if (FAILED(res)) return res;
-
                 res = IWICBitmapSource_CopyPalette(This->source, palette);
-                if (SUCCEEDED(res))
-                    res = IWICPalette_GetColors(palette, 2, colors, &actualcolors);
-
-                IWICPalette_Release(palette);
-
-                if (FAILED(res)) return res;
-            }
             else
-            {
-                colors[0] = 0xff000000;
-                colors[1] = 0xffffffff;
-            }
+                res = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedBW, FALSE);
+
+            if (SUCCEEDED(res))
+                res = IWICPalette_GetColors(palette, 2, colors, &actualcolors);
+
+            IWICPalette_Release(palette);
+            if (FAILED(res)) return res;
 
             srcstride = (prc->Width+7)/8;
             srcdatasize = srcstride * prc->Height;