pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Christoph Mallon: Remove pointless if (x) before SDL_FreeSurface(x)

Browse source
This commit is contained in:
Sam Lantinga 2013-08-29 08:29:51 -07:00
parent 08dfaaa2e6
commit 62d7359fd5
9 changed files with 51 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video/SDL_bmp.c
View file

@ -398,9 +398,7 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
if (src) {
SDL_RWseek(src, fp_offset, RW_SEEK_SET);
}
if (surface) {
SDL_FreeSurface(surface);
}
SDL_FreeSurface(surface);
surface = NULL;
}
if (freesrc && src) {

8
src/video/SDL_video.c
View file

@ -1432,9 +1432,7 @@ SDL_SetWindowIcon(SDL_Window * window, SDL_Surface * icon)
return;
}
if (window->icon) {
SDL_FreeSurface(window->icon);
}
SDL_FreeSurface(window->icon);
/* Convert the icon into ARGB8888 */
window->icon = SDL_ConvertSurfaceFormat(icon, SDL_PIXELFORMAT_ARGB8888, 0);
@ -2183,9 +2181,7 @@ SDL_DestroyWindow(SDL_Window * window)
/* Free memory associated with the window */
SDL_free(window->title);
if (window->icon) {
SDL_FreeSurface(window->icon);
}
SDL_FreeSurface(window->icon);
SDL_free(window->gamma);
while (window->data) {
SDL_WindowUserData *data = window->data;

3
src/video/directfb/SDL_DirectFB_window.c
View file

@ -237,8 +237,7 @@ DirectFB_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
}
return;
error:
if (surface)
SDL_FreeSurface(surface);
SDL_FreeSurface(surface);
SDL_DFB_RELEASE(windata->icon);
return;
}

8
src/video/dummy/SDL_nullframebuffer.c
View file

@ -38,9 +38,7 @@ int SDL_DUMMY_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * forma
/* Free the old framebuffer surface */
surface = (SDL_Surface *) SDL_GetWindowData(window, DUMMY_SURFACE);
if (surface) {
SDL_FreeSurface(surface);
}
SDL_FreeSurface(surface);
/* Create a new one */
SDL_PixelFormatEnumToMasks(surface_format, &bpp, &Rmask, &Gmask, &Bmask, &Amask);
@ -83,9 +81,7 @@ void SDL_DUMMY_DestroyWindowFramebuffer(_THIS, SDL_Window * window)
SDL_Surface *surface;
surface = (SDL_Surface *) SDL_SetWindowData(window, DUMMY_SURFACE, NULL);
if (surface) {
SDL_FreeSurface(surface);
}
SDL_FreeSurface(surface);
}
#endif /* SDL_VIDEO_DRIVER_DUMMY */