You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against e9231beb865da13941d19eca016a6ccac07cb3f4.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 7e6eb1a23949bddd3538447d5393d4b66d061f1b Mon Sep 17 00:00:00 2001
|
||||
From 5dcb81fa70edefd525cad861d7cac7706db47871 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Sun, 16 Oct 2016 17:34:21 +0800
|
||||
Subject: windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG
|
||||
@@ -9,11 +9,11 @@ Subject: windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG
|
||||
1 file changed, 15 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c
|
||||
index 9ec64e7..7d8beab 100644
|
||||
index 451d725eb8..a060d569f8 100644
|
||||
--- a/dlls/windowscodecs/jpegformat.c
|
||||
+++ b/dlls/windowscodecs/jpegformat.c
|
||||
@@ -1386,11 +1386,22 @@ static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface,
|
||||
return E_NOTIMPL;
|
||||
@@ -1392,11 +1392,22 @@ static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, G
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
-static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface,
|
||||
@@ -40,5 +40,5 @@ index 9ec64e7..7d8beab 100644
|
||||
|
||||
static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface,
|
||||
--
|
||||
2.9.0
|
||||
2.14.1
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From b0dda2778cbd2c33b90f2f500013f48c6fdb0b58 Mon Sep 17 00:00:00 2001
|
||||
From 00ebc80c47100fe08c13f685ecd5b75fd94c6f13 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Fri, 21 Oct 2016 14:36:21 +0800
|
||||
Subject: windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in the PNG
|
||||
@@ -9,11 +9,11 @@ Subject: windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in the PNG
|
||||
1 file changed, 15 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c
|
||||
index 1a409ae..94253d3 100644
|
||||
index c0e5a59cf9..786d8360e0 100644
|
||||
--- a/dlls/windowscodecs/pngformat.c
|
||||
+++ b/dlls/windowscodecs/pngformat.c
|
||||
@@ -1936,11 +1936,22 @@ static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface,
|
||||
return E_NOTIMPL;
|
||||
@@ -1979,11 +1979,22 @@ static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GU
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
-static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface,
|
||||
@@ -40,5 +40,5 @@ index 1a409ae..94253d3 100644
|
||||
|
||||
static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface,
|
||||
--
|
||||
2.9.0
|
||||
2.14.1
|
||||
|
||||
|
Reference in New Issue
Block a user