icculus/SDL-audio-capture: comparison test/testpalette.c

equal deleted inserted replaced

-:7d8e1925f35b
+:be9c9c8f6d53
 {4,203,252}, {3,181,252}, {2,158,252}, {1,136,251},
 {0,111,248}, {0,82,234}, {0,63,213}, {0,50,192},
 {0,39,172}, {0,28,152}, {0,17,132}, {0,7,114}
 };
+/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
+static void quit(int rc)
+{
+	SDL_Quit();
+	exit(rc);
+}
 static void sdlerr(char *when)
 {
 fprintf(stderr, "SDL error: %s: %s\n", when, SDL_GetError());
-exit(1);
+quit(1);
 }
 /* create a background surface */
 static SDL_Surface *make_bg(SDL_Surface *screen, int startcol)
 {
 int gamma_fade = 0;
 int gamma_ramp = 0;
 if(SDL_Init(SDL_INIT_VIDEO) < 0)
 	sdlerr("initialising SDL");
-atexit(SDL_Quit);
 while(--argc) {
 	++argv;
 	if(strcmp(*argv, "-hw") == 0)
 	    vidflags |= SDL_HWSURFACE;
 	    gamma_ramp = 1;
 	else {
 	    fprintf(stderr,
 		    "usage: testpalette "
 		    " [-hw] [-fullscreen] [-nofade] [-gamma] [-gammaramp]\n");
-	    return 1;
+	    quit(1);
 	}
 }
 /* Ask explicitly for 8bpp and a hardware palette */
 if(!(screen = SDL_SetVideoMode(SCRW, SCRH, 8, vidflags | SDL_HWPALETTE))) {
 	fprintf(stderr, "error setting %dx%d 8bpp indexed mode: %s\n",
 		SCRW, SCRH, SDL_GetError());
-	return 1;
+	quit(1);
 }
 if(!(boat[0] = SDL_LoadBMP("sail.bmp")))
 	sdlerr("loading sail.bmp");
 /* We've chosen magenta (#ff00ff) as colour key for the boat */
 	frames++;
 } while(fade_level > 0);
 printf("%d frames, %.2f fps\n",
 	   frames, 1000.0 * frames / (SDL_GetTicks() - start));
+SDL_Quit();
 return 0;
 }