Rebase against 35f82ba444930b770684f0bd623c505d52c7b58f.

This commit is contained in:
Sebastian Lackner
2017-07-12 12:22:15 +02:00
parent 3ebda6fa93
commit 4c1a8684a0
10 changed files with 117 additions and 924 deletions

View File

@@ -1,4 +1,4 @@
From bddc58a7a0c3bb53e46f107449c776b86e34aa80 Mon Sep 17 00:00:00 2001
From b20d8d374c84cd6fc2056c24b92832e9279ffaca Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Mon, 17 Oct 2016 15:23:39 +0800
Subject: gdiplus: Fix a typo in GIF container format passed to
@@ -9,19 +9,19 @@ Subject: gdiplus: Fix a typo in GIF container format passed to
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 74fad29..af87236 100644
index 80ad65f050d..5ff48f8131e 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -4512,7 +4512,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream,
@@ -4579,7 +4579,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream,
static GpStatus encode_image_gif(GpImage *image, IStream* stream,
GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params)
GDIPCONST EncoderParameters* params)
{
- return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params);
+ return encode_image_wic(image, stream, &GUID_ContainerFormatGif, params);
}
/*****************************************************************************
@@ -4525,7 +4525,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream,
@@ -4592,7 +4592,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream,
encode_image_func encode_image;
int i;
@@ -31,5 +31,5 @@ index 74fad29..af87236 100644
if(!image || !stream)
return InvalidParameter;
--
2.9.0
2.13.1