mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
102 lines
4.9 KiB
Diff
102 lines
4.9 KiB
Diff
From 39d690bf0ea117214e76419876188c7277ae1749 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
|
Date: Thu, 26 Jan 2017 19:01:21 +0800
|
|
Subject: [PATCH] windowscodecs: Fix 32bppRGB to 32bppRGBA conversion.
|
|
|
|
---
|
|
dlls/windowscodecs/converter.c | 2 ++
|
|
dlls/windowscodecs/tests/converter.c | 43 ++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 45 insertions(+)
|
|
|
|
diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c
|
|
index 47de603..d23c262 100644
|
|
--- a/dlls/windowscodecs/converter.c
|
|
+++ b/dlls/windowscodecs/converter.c
|
|
@@ -868,7 +868,9 @@ static HRESULT copypixels_to_32bppRGBA(struct FormatConverter *This, const WICRe
|
|
|
|
switch (source_format)
|
|
{
|
|
+ case format_32bppRGB:
|
|
case format_32bppRGBA:
|
|
+ case format_32bppPRGBA:
|
|
if (prc)
|
|
return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer);
|
|
return S_OK;
|
|
diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c
|
|
index 5480584..77db7e8 100644
|
|
--- a/dlls/windowscodecs/tests/converter.c
|
|
+++ b/dlls/windowscodecs/tests/converter.c
|
|
@@ -258,6 +258,21 @@ static BOOL compare_bits(const struct bitmap_data *expect, UINT buffersize, cons
|
|
if (!equal && expect->alt_data)
|
|
equal = compare_bits(expect->alt_data, buffersize, converted_bits);
|
|
|
|
+ if (!equal && winetest_debug > 1)
|
|
+ {
|
|
+ UINT i, bps;
|
|
+ bps = expect->bpp / 8;
|
|
+ if (!bps) bps = buffersize;
|
|
+ printf("converted_bits (%u bytes):\n ", buffersize);
|
|
+ for (i = 0; i < buffersize; i++)
|
|
+ {
|
|
+ printf("%u,", converted_bits[i]);
|
|
+ if (!((i + 1) % 32)) printf("\n ");
|
|
+ else if (!((i+1) % bps)) printf(" ");
|
|
+ }
|
|
+ printf("\n");
|
|
+ }
|
|
+
|
|
return equal;
|
|
}
|
|
|
|
@@ -353,12 +368,34 @@ static const BYTE bits_32bppBGR[] = {
|
|
0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80};
|
|
static const struct bitmap_data testdata_32bppBGR = {
|
|
&GUID_WICPixelFormat32bppBGR, 32, bits_32bppBGR, 4, 2, 96.0, 96.0};
|
|
+static const struct bitmap_data testdata_32bppBGRA80 = {
|
|
+ &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGR, 32, 2, 96.0, 96.0};
|
|
+static const struct bitmap_data testdata_32bppRGBA80 = {
|
|
+ &GUID_WICPixelFormat32bppRGBA, 32, bits_32bppBGR, 32, 2, 96.0, 96.0};
|
|
|
|
static const BYTE bits_32bppBGRA[] = {
|
|
255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255,
|
|
0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255};
|
|
static const struct bitmap_data testdata_32bppBGRA = {
|
|
&GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGRA, 4, 2, 96.0, 96.0};
|
|
+static const struct bitmap_data testdata_32bppRGBA = {
|
|
+ &GUID_WICPixelFormat32bppRGBA, 32, bits_32bppBGRA, 32, 2, 96.0, 96.0};
|
|
+static const struct bitmap_data testdata_32bppRGB = {
|
|
+ &GUID_WICPixelFormat32bppRGB, 32, bits_32bppBGRA, 32, 2, 96.0, 96.0};
|
|
+
|
|
+static const BYTE bits_32bppPBGRA[] = {
|
|
+ 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80,
|
|
+ 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80,
|
|
+ 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80,
|
|
+ 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80,
|
|
+ 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80,
|
|
+ 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80,
|
|
+ 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80,
|
|
+ 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80};
|
|
+static const struct bitmap_data testdata_32bppPBGRA = {
|
|
+ &GUID_WICPixelFormat32bppPBGRA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0};
|
|
+static const struct bitmap_data testdata_32bppPRGBA = {
|
|
+ &GUID_WICPixelFormat32bppPRGBA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0};
|
|
|
|
/* XP and 2003 use linear color conversion, later versions use sRGB gamma */
|
|
static const float bits_32bppGrayFloat_xp[] = {
|
|
@@ -1684,6 +1721,12 @@ START_TEST(converter)
|
|
test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", FALSE);
|
|
test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", FALSE);
|
|
test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", FALSE);
|
|
+ test_conversion(&testdata_32bppBGRA80, &testdata_32bppPBGRA, "BGRA -> PBGRA", FALSE);
|
|
+
|
|
+ test_conversion(&testdata_32bppRGBA, &testdata_32bppRGB, "RGBA -> RGB", FALSE);
|
|
+ test_conversion(&testdata_32bppRGB, &testdata_32bppRGBA, "RGB -> RGBA", FALSE);
|
|
+ test_conversion(&testdata_32bppRGBA, &testdata_32bppRGBA, "RGBA -> RGBA", FALSE);
|
|
+ test_conversion(&testdata_32bppRGBA80, &testdata_32bppPRGBA, "RGBA -> PRGBA", FALSE);
|
|
|
|
test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR -> 24bppBGR", FALSE);
|
|
test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR -> 24bppRGB", FALSE);
|
|
--
|
|
1.9.1
|
|
|