Rebase against dc328fe314970d39cbe6e330d99102adf619a73c

This commit is contained in:
Alistair Leslie-Hughes
2018-03-07 11:11:36 +11:00
parent 28c580ffb4
commit 61fcdf539a
5 changed files with 50 additions and 113 deletions

View File

@@ -1,25 +0,0 @@
From 140717936cf4b769bd09d7890290597597bcc131 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 18 Aug 2017 12:03:50 +0800
Subject: [PATCH] windowscodecs: Fix stride calculation in JPEG decoder.
---
dlls/windowscodecs/jpegformat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c
index 0069bdfd89..4636e30a6f 100644
--- a/dlls/windowscodecs/jpegformat.c
+++ b/dlls/windowscodecs/jpegformat.c
@@ -628,7 +628,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface,
else if (This->cinfo.out_color_space == JCS_CMYK) bpp = 32;
else bpp = 24;
- stride = bpp * This->cinfo.output_width;
+ stride = (bpp * This->cinfo.output_width + 7) / 8;
data_size = stride * This->cinfo.output_height;
max_row_needed = prc->Y + prc->Height;
--
2.16.2