Mercurial > sdl-ios-xcode
diff test/testgamma.c @ 1151:be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
if SDL is built with a non-cdecl calling convention, and it's just generally
bad practice anyhow.
Now programs explicitly call SDL_Quit() where appropriate, wrap SDL_Quit() in
a cdecl function where it can't be avoided, and rely on the parachute where
a crash might have hit the atexit() before (these ARE test programs, after
all!).
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 28 Sep 2005 11:36:20 +0000 |
| parents | 74212992fb08 |
| children | 782fd950bd46 c121d94672cb |
line wrap: on
line diff
--- a/test/testgamma.c Wed Sep 28 06:38:22 2005 +0000 +++ b/test/testgamma.c Wed Sep 28 11:36:20 2005 +0000 @@ -8,6 +8,13 @@ #include "SDL.h" +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void quit(int rc) +{ + SDL_Quit(); + exit(rc); +} + /* Turn a normal gamma value into an appropriate gamma ramp */ void CalculateGamma(double gamma, Uint16 *ramp) { @@ -82,16 +89,15 @@ if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) { fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError()); - exit(1); + return(1); } - atexit(SDL_Quit); /* Initialize the display, always use hardware palette */ screen = SDL_SetVideoMode(w, h, bpp, flags | SDL_HWPALETTE); if ( screen == NULL ) { fprintf(stderr, "Couldn't set %dx%d video mode: %s\n", w, h, SDL_GetError()); - exit(1); + quit(1); } /* Set the window manager title bar */ @@ -104,7 +110,7 @@ } if ( SDL_SetGamma(gamma, gamma, gamma) < 0 ) { fprintf(stderr, "Unable to set gamma: %s\n", SDL_GetError()); - exit(1); + quit(1); } #if 0 /* This isn't supported. Integrating the gamma ramps isn't exact */ @@ -186,5 +192,6 @@ } SDL_Delay(1*1000); + SDL_Quit(); return(0); }