From 9a13d50c53f352911875478a0ab5eec4bcdfb3a2 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 17 Feb 2018 19:19:55 -0600 Subject: [PATCH] windowscodecs-Palette_Images: Rebase. --- ...cs-Use-V_UI1-instead-of-V_UNION-to-assign.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/windowscodecs-Palette_Images/0013-windowscodecs-Use-V_UI1-instead-of-V_UNION-to-assign.patch b/patches/windowscodecs-Palette_Images/0013-windowscodecs-Use-V_UI1-instead-of-V_UNION-to-assign.patch index a76648d8..6b2d019a 100644 --- a/patches/windowscodecs-Palette_Images/0013-windowscodecs-Use-V_UI1-instead-of-V_UNION-to-assign.patch +++ b/patches/windowscodecs-Palette_Images/0013-windowscodecs-Use-V_UI1-instead-of-V_UNION-to-assign.patch @@ -1,26 +1,26 @@ -From 56d7b4030df9de1de6fb35ec4f31dad2661f46f9 Mon Sep 17 00:00:00 2001 +From 8fcfe575232841cbd14f3bc8929595c5d2986960 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 20 Sep 2016 17:17:42 +0800 -Subject: windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 - variant member. +Subject: [PATCH 2/8] windowscodecs: Use V_UI1() instead of V_UNION() to assign + a VT_UI1 variant member. --- dlls/windowscodecs/tiffformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c -index d94be78..1f757d8 100644 +index 6fe3f19..2238a0e 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c -@@ -1971,7 +1971,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, +@@ -1973,7 +1973,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, VARIANT v; VariantInit(&v); V_VT(&v) = VT_UI1; - V_UNION(&v, bVal) = WICTiffCompressionDontCare; + V_UI1(&v) = WICTiffCompressionDontCare; - hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, opts, &v); + hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, (PROPBAG2 *)opts, &v); VariantClear(&v); if (FAILED(hr)) -- -2.9.0 +2.7.4