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

gdiplus: Fix palette flags for a not indexed 1-bpp image.

Browse Source
This commit is contained in:
Dmitry Timoshkov 2012-07-13 11:50:05 +09:00 committed by Alexandre Julliard
parent eca107412c
commit ebf31c0ac6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdiplus/image.c
View File

@ -2983,6 +2983,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr
gdip_format = PixelFormat32bppARGB; gdip_format = PixelFormat32bppARGB;
IWICBitmapSource_Release(bmp_source); IWICBitmapSource_Release(bmp_source);
} }
TRACE("%s => %#x\n", wine_dbgstr_guid(&wic_format), gdip_format);
} }
if (SUCCEEDED(hr)) /* got source */ if (SUCCEEDED(hr)) /* got source */
@ -3063,6 +3064,8 @@ end:
bitmap->image.frame_count = frame_count; bitmap->image.frame_count = frame_count;
bitmap->image.current_frame = active_frame; bitmap->image.current_frame = active_frame;
bitmap->image.stream = stream; bitmap->image.stream = stream;
if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite))
bitmap->image.palette_flags = 0;
/* Pin the source stream */ /* Pin the source stream */
IStream_AddRef(stream); IStream_AddRef(stream);
} }

1
dlls/gdiplus/tests/image.c
View File

@ -3340,7 +3340,6 @@ static void test_tiff_palette(void)
status = GdipGetImagePalette(image, &palette.pal, size); status = GdipGetImagePalette(image, &palette.pal, size);
expect(Ok, status); expect(Ok, status);
todo_wine
expect(0, palette.pal.Flags); expect(0, palette.pal.Flags);
expect(2, palette.pal.Count); expect(2, palette.pal.Count);
if (palette.pal.Count == 2) if (palette.pal.Count == 2)