Commit 25f33cb0 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

oleaut32: Do not cast NULL.

parent b609a5c0
...@@ -1610,9 +1610,7 @@ succ: ...@@ -1610,9 +1610,7 @@ succ:
end: end:
if(png_ptr) if(png_ptr)
ppng_destroy_read_struct(&png_ptr, ppng_destroy_read_struct(&png_ptr, info_ptr ? &info_ptr : NULL, NULL);
(info_ptr ? &info_ptr : (png_infopp) NULL),
(png_infopp)NULL);
HeapFree(GetProcessHeap(), 0, row_pointers); HeapFree(GetProcessHeap(), 0, row_pointers);
HeapFree(GetProcessHeap(), 0, pngdata); HeapFree(GetProcessHeap(), 0, pngdata);
return ret; return ret;
......
...@@ -148,16 +148,16 @@ MakeMapObject(int ColorCount, ...@@ -148,16 +148,16 @@ MakeMapObject(int ColorCount,
/*** FIXME: Our ColorCount has to be a power of two. Is it necessary to /*** FIXME: Our ColorCount has to be a power of two. Is it necessary to
* make the user know that or should we automatically round up instead? */ * make the user know that or should we automatically round up instead? */
if (ColorCount != (1 << BitSize(ColorCount))) { if (ColorCount != (1 << BitSize(ColorCount))) {
return ((ColorMapObject *) NULL); return NULL;
} }
Object = ungif_alloc(sizeof(ColorMapObject)); Object = ungif_alloc(sizeof(ColorMapObject));
if (Object == (ColorMapObject *) NULL) { if (Object == NULL) {
return ((ColorMapObject *) NULL); return NULL;
} }
Object->Colors = ungif_calloc(ColorCount, sizeof(GifColorType)); Object->Colors = ungif_calloc(ColorCount, sizeof(GifColorType));
if (Object->Colors == (GifColorType *) NULL) { if (Object->Colors == NULL) {
return NULL; return NULL;
} }
...@@ -413,9 +413,9 @@ DGifGetImageDesc(GifFileType * GifFile) { ...@@ -413,9 +413,9 @@ DGifGetImageDesc(GifFileType * GifFile) {
return GIF_ERROR; return GIF_ERROR;
} }
} }
sp->RasterBits = (unsigned char *)NULL; sp->RasterBits = NULL;
sp->ExtensionBlockCount = 0; sp->ExtensionBlockCount = 0;
sp->ExtensionBlocks = (ExtensionBlock *) NULL; sp->ExtensionBlocks = NULL;
GifFile->ImageCount++; GifFile->ImageCount++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment