Akihiro Sagawa : gdiplus: Add 4bppIndexed to the list of supported formats.
Alexandre Julliard
julliard at winehq.org
Thu Nov 8 14:47:26 CST 2018
Module: wine
Branch: master
Commit: 0e082c0416b49dede36e5012ec875e6bb41d110c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e082c0416b49dede36e5012ec875e6bb41d110c
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Thu Nov 8 22:17:06 2018 +0900
gdiplus: Add 4bppIndexed to the list of supported formats.
Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdiplus/image.c | 1 +
dlls/gdiplus/tests/image.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index ccfa165..2e844cf 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -55,6 +55,7 @@ static const struct
{
{ &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW },
{ &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW },
+ { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 },
{ &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 },
{ &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 },
{ &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 },
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 41ec4dc..b31f32e 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -5213,7 +5213,7 @@ static void test_png_color_formats(void)
{ 0, 0 }}},
{ 4, PNG_COLOR_TYPE_PALETTE,
{{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB },
- { PixelFormat4bppIndexed, ImageFlagsColorSpaceRGB, TRUE },
+ { PixelFormat4bppIndexed, ImageFlagsColorSpaceRGB },
{ 0, 0 }}},
{ 8, PNG_COLOR_TYPE_PALETTE,
{{ PixelFormat32bppARGB, ImageFlagsColorSpaceRGB },
More information about the wine-cvs
mailing list