windowscodecs: Remove unneeded address-of operators from array names
Andrew Talbot
andrew.talbot at talbotville.com
Tue Nov 1 17:51:46 CDT 2011
Changelog:
windowscodecs: Remove unneeded address-of operators from array names.
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-patches
mailing list