windowscodecs-TIFF_Support: Fix order of pixel formats in gdiplus.

This commit is contained in:
Sebastian Lackner 2017-03-20 19:09:27 +01:00
parent 12f8688fc5
commit 912df91ba1

View File

@ -1,4 +1,4 @@
From a2ad6b7fb8674d821659685d838690d9637d5844 Mon Sep 17 00:00:00 2001
From d1795154072c2b4c358e3f11d641b95db347632c Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 16 Dec 2016 18:09:55 +0800
Subject: gdiplus: Add support for more image color formats.
@ -8,7 +8,7 @@ Subject: gdiplus: Add support for more image color formats.
1 file changed, 6 insertions(+)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index ac17104..aa1ff10 100644
index bff0cdc836..ce2194317f 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -55,13 +55,19 @@ static const struct
@ -17,7 +17,6 @@ index ac17104..aa1ff10 100644
{ &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW },
+ { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 },
{ &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 },
+ { &GUID_WICPixelFormat32bppGrayFloat, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedGray256 },
{ &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 },
{ &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 },
{ &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 },
@ -26,11 +25,12 @@ index ac17104..aa1ff10 100644
{ &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 },
{ &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 },
+ { &GUID_WICPixelFormat32bppCMYK, PixelFormat32bppCMYK, WICBitmapPaletteTypeFixedHalftone256 },
+ { &GUID_WICPixelFormat32bppGrayFloat, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedGray256 },
+ { &GUID_WICPixelFormat64bppCMYK, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 },
+ { &GUID_WICPixelFormat64bppRGBA, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 },
{ NULL }
};
--
2.9.0
2.11.0