Dmitry Timoshkov : gdiplus: Make sure that 1bpp bitmap images get loaded in native format.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eca107412c581c28dc198d0808949bc999197872
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eca107412c581c28dc198d0808...

Author: Dmitry Timoshkov 
Date:   Fri Jul 13 11:47:57 2012 +0900

gdiplus: Make sure that 1bpp bitmap images get loaded in native format.

---

dlls/gdiplus/image.c       |    4 ++++
 dlls/gdiplus/tests/image.c |    4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 9b36280..18df589 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -2908,6 +2908,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage *
 }

static const WICPixelFormatGUID * const wic_pixel_formats[] = {
+    &GUID_WICPixelFormatBlackWhite,
+    &GUID_WICPixelFormat1bppIndexed,
     &GUID_WICPixelFormat16bppBGR555,
     &GUID_WICPixelFormat24bppBGR,
     &GUID_WICPixelFormat32bppBGR,
@@ -2917,6 +2919,8 @@ static const WICPixelFormatGUID * const wic_pixel_formats[] = {
 };

static const PixelFormat wic_gdip_formats[] = {
+    PixelFormat1bppIndexed,
+    PixelFormat1bppIndexed,
     PixelFormat16bppRGB555,
     PixelFormat24bppRGB,
     PixelFormat32bppRGB,
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 1f5ace1..a735172 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -3326,7 +3326,6 @@ static void test_tiff_palette(void)

status = GdipGetImagePixelFormat(image, &format);
     expect(Ok, status);
-todo_wine
     ok(format == PixelFormat1bppIndexed, "expected PixelFormat1bppIndexed, got %#x\n", format);

status = GdipGetImagePaletteSize(image, &size);
@@ -3337,13 +3336,12 @@ todo_wine
         GdipDisposeImage(image);
         return;
     }
-todo_wine
     expect(sizeof(ColorPalette) + sizeof(ARGB), size);

status = GdipGetImagePalette(image, &palette.pal, size);
     expect(Ok, status);
-    expect(0, palette.pal.Flags);
 todo_wine
+    expect(0, palette.pal.Flags);
     expect(2, palette.pal.Count);
     if (palette.pal.Count == 2)
     {