Michael Stefaniuc : windowscodecs: Silence a warning due to an API change in libpng 1.5.
Alexandre Julliard
julliard at winehq.org
Thu Aug 22 14:18:41 CDT 2013
Module: wine
Branch: master
Commit: 4a5bc1375ee446a9aec04cc3f39ee6ac2ee7f39a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5bc1375ee446a9aec04cc3f39ee6ac2ee7f39a
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Aug 22 14:35:34 2013 +0200
windowscodecs: Silence a warning due to an API change in libpng 1.5.
---
dlls/windowscodecs/pngformat.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c
index 065b5b8..b79d839 100644
--- a/dlls/windowscodecs/pngformat.c
+++ b/dlls/windowscodecs/pngformat.c
@@ -866,7 +866,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i
UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount)
{
PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface);
- png_charp name, profile;
+ png_charp name;
+ BYTE *profile;
png_uint_32 len;
int compression_type;
HRESULT hr;
@@ -877,11 +878,11 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i
EnterCriticalSection(&This->lock);
- if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len))
+ if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, (void *)&profile, &len))
{
if (cCount && ppIColorContexts)
{
- hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, (const BYTE *)profile, len);
+ hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len);
if (FAILED(hr))
{
LeaveCriticalSection(&This->lock);
More information about the wine-cvs
mailing list