ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-08 10:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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 f79fc33a39
commit 3e2930defe
9 changed files with 51 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/events/SDL_mouse.c
View file

@ -571,9 +571,7 @@ SDL_CreateColorCursor(SDL_Surface *surface, int hot_x, int hot_y)
mouse->cursors = cursor; mouse->cursors = cursor;
} }
if (temp) {
SDL_FreeSurface(temp); SDL_FreeSurface(temp);
}
return cursor; return cursor;
} }

6
src/render/SDL_yuv_sw.c
View file

@ -1012,10 +1012,8 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
break; break;
} }
if (swdata->display) {
SDL_FreeSurface(swdata->display); SDL_FreeSurface(swdata->display);
swdata->display = NULL; swdata->display = NULL;
}
return 0; return 0;
} }
@ -1338,12 +1336,8 @@ SDL_SW_DestroyYUVTexture(SDL_SW_YUVTexture * swdata)
SDL_free(swdata->pixels); SDL_free(swdata->pixels);
SDL_free(swdata->colortab); SDL_free(swdata->colortab);
SDL_free(swdata->rgb_2_pix); SDL_free(swdata->rgb_2_pix);
if (swdata->stretch) {
SDL_FreeSurface(swdata->stretch); SDL_FreeSurface(swdata->stretch);
}
if (swdata->display) {
SDL_FreeSurface(swdata->display); SDL_FreeSurface(swdata->display);
}
SDL_free(swdata); SDL_free(swdata);
} }
} }

2
src/video/SDL_bmp.c
View file

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

4
src/video/SDL_video.c
View file

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

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

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

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

22
test/testautomation_render.c
View file

@ -190,10 +190,8 @@ int render_testPrimitives (void *arg)
_compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE ); _compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE );
/* Clean up. */ /* Clean up. */
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -333,10 +331,8 @@ int render_testPrimitivesBlend (void *arg)
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED ); _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
/* Clean up. */ /* Clean up. */
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -400,10 +396,8 @@ render_testBlit(void *arg)
/* Clean up. */ /* Clean up. */
SDL_DestroyTexture( tface ); SDL_DestroyTexture( tface );
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -470,10 +464,8 @@ render_testBlitColor (void *arg)
/* Clean up. */ /* Clean up. */
SDL_DestroyTexture( tface ); SDL_DestroyTexture( tface );
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -543,10 +535,8 @@ render_testBlitAlpha (void *arg)
/* Clean up. */ /* Clean up. */
SDL_DestroyTexture( tface ); SDL_DestroyTexture( tface );
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -655,37 +645,29 @@ render_testBlitBlend (void *arg)
_testBlitBlendMode( tface, SDL_BLENDMODE_NONE ); _testBlitBlendMode( tface, SDL_BLENDMODE_NONE );
referenceSurface = SDLTest_ImageBlitBlendNone(); referenceSurface = SDLTest_ImageBlitBlendNone();
_compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE ); _compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE );
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
/* Test Blend. */ /* Test Blend. */
_testBlitBlendMode( tface, SDL_BLENDMODE_BLEND ); _testBlitBlendMode( tface, SDL_BLENDMODE_BLEND );
referenceSurface = SDLTest_ImageBlitBlend(); referenceSurface = SDLTest_ImageBlitBlend();
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED ); _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
/* Test Add. */ /* Test Add. */
_testBlitBlendMode( tface, SDL_BLENDMODE_ADD ); _testBlitBlendMode( tface, SDL_BLENDMODE_ADD );
referenceSurface = SDLTest_ImageBlitBlendAdd(); referenceSurface = SDLTest_ImageBlitBlendAdd();
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED ); _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
/* Test Mod. */ /* Test Mod. */
_testBlitBlendMode( tface, SDL_BLENDMODE_MOD); _testBlitBlendMode( tface, SDL_BLENDMODE_MOD);
referenceSurface = SDLTest_ImageBlitBlendMod(); referenceSurface = SDLTest_ImageBlitBlendMod();
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED ); _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
/* Clear surface. */ /* Clear surface. */
_clearScreen(); _clearScreen();
@ -733,10 +715,8 @@ render_testBlitBlend (void *arg)
/* Check to see if final image matches. */ /* Check to see if final image matches. */
referenceSurface = SDLTest_ImageBlitBlendAll(); referenceSurface = SDLTest_ImageBlitBlendAll();
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED); _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED);
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -996,9 +976,7 @@ _compare(SDL_Surface *referenceSurface, int allowable_error)
/* Clean up. */ /* Clean up. */
SDL_free(pixels); SDL_free(pixels);
if (testSurface != NULL) {
SDL_FreeSurface(testSurface); SDL_FreeSurface(testSurface);
}
} }
/** /**

48
test/testautomation_surface.c
View file

@ -63,14 +63,10 @@ _surfaceSetUp(void *arg)
void void
_surfaceTearDown(void *arg) _surfaceTearDown(void *arg)
{ {
if (referenceSurface != NULL) {
SDL_FreeSurface(referenceSurface); SDL_FreeSurface(referenceSurface);
referenceSurface = NULL; referenceSurface = NULL;
}
if (testSurface != NULL) {
SDL_FreeSurface(testSurface); SDL_FreeSurface(testSurface);
testSurface = NULL; testSurface = NULL;
}
} }
/** /**
@ -193,10 +189,8 @@ void _testBlitBlendMode(int mode)
SDLTest_AssertCheck(checkFailCount4 == 0, "Validate results from calls to SDL_SetSurfaceBlendMode, expected: 0, got: %i", checkFailCount4); SDLTest_AssertCheck(checkFailCount4 == 0, "Validate results from calls to SDL_SetSurfaceBlendMode, expected: 0, got: %i", checkFailCount4);
/* Clean up */ /* Clean up */
if (face != NULL) {
SDL_FreeSurface(face); SDL_FreeSurface(face);
face = NULL; face = NULL;
}
} }
/* Helper to check that a file exists */ /* Helper to check that a file exists */
@ -250,14 +244,10 @@ surface_testSaveLoadBitmap(void *arg)
unlink(sampleFilename); unlink(sampleFilename);
/* Clean up */ /* Clean up */
if (face != NULL) {
SDL_FreeSurface(face); SDL_FreeSurface(face);
face = NULL; face = NULL;
}
if (rface != NULL) {
SDL_FreeSurface(rface); SDL_FreeSurface(rface);
rface = NULL; rface = NULL;
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -294,14 +284,10 @@ surface_testSurfaceConversion(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (face != NULL) { SDL_FreeSurface(face);
SDL_FreeSurface( face );
face = NULL; face = NULL;
} SDL_FreeSurface(rface);
if (rface != NULL) {
SDL_FreeSurface( rface );
rface = NULL; rface = NULL;
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -427,9 +413,7 @@ surface_testBlit(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (compareSurface != NULL) { SDL_FreeSurface(compareSurface);
SDL_FreeSurface( compareSurface );
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -452,9 +436,7 @@ surface_testBlitColorMod(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (compareSurface != NULL) { SDL_FreeSurface(compareSurface);
SDL_FreeSurface( compareSurface );
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -477,9 +459,7 @@ surface_testBlitAlphaMod(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (compareSurface != NULL) { SDL_FreeSurface(compareSurface);
SDL_FreeSurface( compareSurface );
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -503,9 +483,7 @@ surface_testBlitBlendNone(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (compareSurface != NULL) { SDL_FreeSurface(compareSurface);
SDL_FreeSurface( compareSurface );
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -528,9 +506,7 @@ surface_testBlitBlendBlend(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (compareSurface != NULL) { SDL_FreeSurface(compareSurface);
SDL_FreeSurface( compareSurface );
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -553,9 +529,7 @@ surface_testBlitBlendAdd(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (compareSurface != NULL) { SDL_FreeSurface(compareSurface);
SDL_FreeSurface( compareSurface );
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -578,9 +552,7 @@ surface_testBlitBlendMod(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (compareSurface != NULL) { SDL_FreeSurface(compareSurface);
SDL_FreeSurface( compareSurface );
}
return TEST_COMPLETED; return TEST_COMPLETED;
} }
@ -603,9 +575,7 @@ surface_testBlitBlendLoop(void *arg) {
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret); SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */ /* Clean up. */
if (compareSurface != NULL) {
SDL_FreeSurface(compareSurface); SDL_FreeSurface(compareSurface);
}
return TEST_COMPLETED; return TEST_COMPLETED;

1
test/testshape.c
View file

@ -90,7 +90,6 @@ int main(int argc,char** argv)
if(pictures[i].surface == NULL) { if(pictures[i].surface == NULL) {
j = 0; j = 0;
for(j=0;j<num_pictures;j++) for(j=0;j<num_pictures;j++)
if(pictures[j].surface != NULL)
SDL_FreeSurface(pictures[j].surface); SDL_FreeSurface(pictures[j].surface);
SDL_free(pictures); SDL_free(pictures);
SDL_VideoQuit(); SDL_VideoQuit();