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

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

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

4
dlls/gdiplus/image.c
View File

@ -2908,6 +2908,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage *
} }
static const WICPixelFormatGUID * const wic_pixel_formats[] = { static const WICPixelFormatGUID * const wic_pixel_formats[] = {
&GUID_WICPixelFormatBlackWhite,
&GUID_WICPixelFormat1bppIndexed,
&GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR555,
&GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR,
&GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGR,
@ -2917,6 +2919,8 @@ static const WICPixelFormatGUID * const wic_pixel_formats[] = {
}; };
static const PixelFormat wic_gdip_formats[] = { static const PixelFormat wic_gdip_formats[] = {
PixelFormat1bppIndexed,
PixelFormat1bppIndexed,
PixelFormat16bppRGB555, PixelFormat16bppRGB555,
PixelFormat24bppRGB, PixelFormat24bppRGB,
PixelFormat32bppRGB, PixelFormat32bppRGB,

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

@ -3326,7 +3326,6 @@ static void test_tiff_palette(void)
status = GdipGetImagePixelFormat(image, &format); status = GdipGetImagePixelFormat(image, &format);
expect(Ok, status); expect(Ok, status);
todo_wine
ok(format == PixelFormat1bppIndexed, "expected PixelFormat1bppIndexed, got %#x\n", format); ok(format == PixelFormat1bppIndexed, "expected PixelFormat1bppIndexed, got %#x\n", format);
status = GdipGetImagePaletteSize(image, &size); status = GdipGetImagePaletteSize(image, &size);
@ -3337,13 +3336,12 @@ todo_wine
GdipDisposeImage(image); GdipDisposeImage(image);
return; return;
} }
todo_wine
expect(sizeof(ColorPalette) + sizeof(ARGB), size); expect(sizeof(ColorPalette) + sizeof(ARGB), size);
status = GdipGetImagePalette(image, &palette.pal, size); status = GdipGetImagePalette(image, &palette.pal, size);
expect(Ok, status); expect(Ok, status);
expect(0, palette.pal.Flags);
todo_wine todo_wine
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)
{ {