Andrew Talbot : windowscodecs: Remove unneeded address-of operators from array names.
Alexandre Julliard
julliard at winehq.org
Wed Nov 2 14:23:36 CDT 2011
Module: wine
Branch: master
Commit: e1b7291785e7b9059cca6f2fc1a9c9439093e683
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b7291785e7b9059cca6f2fc1a9c9439093e683
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Tue Nov 1 22:51:46 2011 +0000
windowscodecs: Remove unneeded address-of operators from array names.
---
dlls/windowscodecs/jpegformat.c | 4 ++--
dlls/windowscodecs/pngformat.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c
index 083a352..0cb9fc2 100644
--- a/dlls/windowscodecs/jpegformat.c
+++ b/dlls/windowscodecs/jpegformat.c
@@ -284,7 +284,7 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream *
This->cinfo.err = &This->jerr;
- This->cinfo.client_data = &jmpbuf;
+ This->cinfo.client_data = jmpbuf;
if (setjmp(jmpbuf))
{
@@ -576,7 +576,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface,
}
}
- This->cinfo.client_data = &jmpbuf;
+ This->cinfo.client_data = jmpbuf;
if (setjmp(jmpbuf))
{
diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c
index c7c3cab..ce99509 100644
--- a/dlls/windowscodecs/pngformat.c
+++ b/dlls/windowscodecs/pngformat.c
@@ -304,7 +304,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
hr = E_FAIL;
goto end;
}
- ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn);
+ ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn);
/* seek to the start of the stream */
seek.QuadPart = 0;
@@ -1015,7 +1015,7 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface,
HeapFree(GetProcessHeap(), 0, row_pointers);
return E_FAIL;
}
- ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn);
+ ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn);
if (!This->info_written)
{
@@ -1153,7 +1153,7 @@ static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface)
LeaveCriticalSection(&This->lock);
return E_FAIL;
}
- ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn);
+ ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn);
ppng_write_end(This->png_ptr, This->info_ptr);
@@ -1305,7 +1305,7 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface,
LeaveCriticalSection(&This->lock);
return E_FAIL;
}
- ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn);
+ ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn);
/* set up custom i/o handling */
ppng_set_write_fn(This->png_ptr, This, user_write_data, user_flush);
More information about the wine-cvs
mailing list