Added patch to fix a typo in 2bppIndexed to 32bppBGRA conversion routine.

This commit is contained in:
Sebastian Lackner 2016-11-15 16:57:53 +01:00
parent 39bf451aea
commit fb62a188f4
2 changed files with 42 additions and 0 deletions

View File

@ -345,6 +345,7 @@ patch_enable_all ()
enable_wbemdisp_ISWbemSecurity="$1"
enable_wbemdisp_Printer="$1"
enable_widl_SLTG_Typelib_Support="$1"
enable_windowscodecs_32bppBGRA="$1"
enable_windowscodecs_32bppGrayFloat="$1"
enable_windowscodecs_GIF_Encoder="$1"
enable_windowscodecs_IMILBitmapSource="$1"
@ -1215,6 +1216,9 @@ patch_enable ()
widl-SLTG_Typelib_Support)
enable_widl_SLTG_Typelib_Support="$2"
;;
windowscodecs-32bppBGRA)
enable_windowscodecs_32bppBGRA="$2"
;;
windowscodecs-32bppGrayFloat)
enable_windowscodecs_32bppGrayFloat="$2"
;;
@ -7117,6 +7121,18 @@ if test "$enable_wbemdisp_Printer" -eq 1; then
) >> "$patchlist"
fi
# Patchset windowscodecs-32bppBGRA
# |
# | Modified files:
# | * dlls/windowscodecs/converter.c
# |
if test "$enable_windowscodecs_32bppBGRA" -eq 1; then
patch_apply windowscodecs-32bppBGRA/0001-windowscodecs-Fix-a-typo-in-2bppIndexed-to-32bppBGRA.patch
(
echo '+ { "Dmitry Timoshkov", "windowscodecs: Fix a typo in 2bppIndexed to 32bppBGRA conversion routine.", 1 },';
) >> "$patchlist"
fi
# Patchset windowscodecs-32bppGrayFloat
# |
# | This patchset fixes the following Wine bugs:

View File

@ -0,0 +1,26 @@
From 4bd593d4d30e913ebda4fa586561dbbc32b4b74a Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Mon, 7 Nov 2016 19:51:40 +0800
Subject: windowscodecs: Fix a typo in 2bppIndexed to 32bppBGRA conversion
routine.
---
dlls/windowscodecs/converter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c
index 4ee980e..5561d42 100644
--- a/dlls/windowscodecs/converter.c
+++ b/dlls/windowscodecs/converter.c
@@ -257,7 +257,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe
*dstpixel++ = colors[srcval>>6];
if (x+1 < prc->Width) *dstpixel++ = colors[srcval>>4&0x3];
if (x+2 < prc->Width) *dstpixel++ = colors[srcval>>2&0x3];
- if (x+1 < prc->Width) *dstpixel++ = colors[srcval&0x3];
+ if (x+3 < prc->Width) *dstpixel++ = colors[srcval&0x3];
}
srcrow += srcstride;
dstrow += cbStride;
--
2.9.0