sdl-ios-xcode: test/testoverlay.c comparison

comparison test/testoverlay.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	6399f4e90211
children	4d3bb026cd16

comparison

equal deleted inserted replaced

-:7d8e1925f35b
+:be9c9c8f6d53
 SDL_Overlay *overlay;
 int scale;
 int monochrome;
 int luminance;
 int w, h;
+/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
+static void quit(int rc)
+{
+	SDL_Quit();
+	exit(rc);
+}
 /* NOTE: These RGB conversion functions are not intended for speed,
 only as examples.
 */
 				argv += 2;
 				argc -= 2;
 			} else {
 				fprintf(stderr,
 				"The -delay option requires an argument\n");
-				exit(1);
+				return(1);
 			}
 		} else
 		if ( strcmp(argv[1], "-width") == 0 ) {
 			if ( argv[2] && ((w = atoi(argv[2])) > 0) ) {
 				argv += 2;
 				argc -= 2;
 			} else {
 				fprintf(stderr,
 				"The -width option requires an argument\n");
-				exit(1);
+				return(1);
 			}
 		} else
 		if ( strcmp(argv[1], "-height") == 0 ) {
 			if ( argv[2] && ((h = atoi(argv[2])) > 0) ) {
 				argv += 2;
 				argc -= 2;
 			} else {
 				fprintf(stderr,
 				"The -height option requires an argument\n");
-				exit(1);
+				return(1);
 			}
 		} else
 		if ( strcmp(argv[1], "-bpp") == 0 ) {
 			if ( argv[2] ) {
 				desired_bpp = atoi(argv[2]);
 				argv += 2;
 				argc -= 2;
 			} else {
 				fprintf(stderr,
 				"The -bpp option requires an argument\n");
-				exit(1);
+				return(1);
 			}
 		} else
 		if ( strcmp(argv[1], "-lum") == 0 ) {
 			if ( argv[2] ) {
 				luminance = atoi(argv[2]);
 				argv += 2;
 				argc -= 2;
 			} else {
 				fprintf(stderr,
 				"The -lum option requires an argument\n");
-				exit(1);
+				return(1);
 			}
 		} else
 		if ( strcmp(argv[1], "-format") == 0 ) {
 			if ( argv[2] ) {
 				if(!strcmp(argv[2],"YV12"))
 				else if(!strcmp(argv[2],"YVYU"))
 					overlay_format = SDL_YVYU_OVERLAY;
 				else
 				{
 					fprintf(stderr, "The -format option %s is not recognized\n",argv[2]);
-					exit(1);
+					return(1);
 				}
 				argv += 2;
 				argc -= 2;
 			} else {
 				fprintf(stderr,
 				"The -format option requires an argument\n");
-				exit(1);
+				return(1);
 			}
 		} else
 		if ( strcmp(argv[1], "-hw") == 0 ) {
 			video_flags |= SDL_HWSURFACE;
 			argv += 1;
 			argv += 1;
 			argc -= 1;
 		} else
 		if (( strcmp(argv[1], "-help") == 0 ) || (strcmp(argv[1], "-h") == 0)) {
 PrintUsage(argv0);
-exit(1);
+return(1);
 		} else
 		if ( strcmp(argv[1], "-fullscreen") == 0 ) {
 			video_flags |= SDL_FULLSCREEN;
 			argv += 1;
 			argc -= 1;
 			break;
 	}
 	if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
 		fprintf(stderr,
 			"Couldn't initialize SDL: %s\n", SDL_GetError());
-		exit(1);
+		return(1);
 	}
-	atexit(SDL_Quit);			/* Clean up on exit */
 	/* Initialize the display */
 	screen = SDL_SetVideoMode(w, h, desired_bpp, video_flags);
 	if ( screen == NULL ) {
 		fprintf(stderr, "Couldn't set %dx%dx%d video mode: %s\n",
 					w, h, desired_bpp, SDL_GetError());
-		exit(1);
+		quit(1);
 	}
 	printf("Set%s %dx%dx%d mode\n",
 			screen->flags & SDL_FULLSCREEN ? " fullscreen" : "",
 			screen->w, screen->h, screen->format->BitsPerPixel);
 	printf("(video surface located in %s memory)\n",
 	bmpfile=(argv[1]?argv[1]:"sample.bmp");
 	pic = SDL_LoadBMP(bmpfile);
 	if ( pic == NULL ) {
 		fprintf(stderr, "Couldn't load %s: %s\n", bmpfile,
 							SDL_GetError());
-		exit(1);
+		quit(1);
 	}
 	/* Convert the picture to 32bits, for easy conversion */
 	{
 		SDL_Surface *newsurf;
 		newsurf=SDL_ConvertSurface(pic, &format, SDL_SWSURFACE);
 		if(!newsurf)
 		{
 			fprintf(stderr, "Couldn't convert picture to 32bits RGB: %s\n",
 							SDL_GetError());
-			exit(1);
+			quit(1);
 		}
 		SDL_FreeSurface(pic);
 		pic=newsurf;
 	}
 	/* Create the overlay */
 	overlay = SDL_CreateYUVOverlay(pic->w, pic->h, overlay_format, screen);
 	if ( overlay == NULL ) {
 		fprintf(stderr, "Couldn't create overlay: %s\n", SDL_GetError());
-		exit(1);
+		quit(1);
 	}
 	printf("Created %dx%dx%d %s %s overlay\n",overlay->w,overlay->h,overlay->planes,
 			overlay->hw_overlay?"hardware":"software",
 			overlay->format==SDL_YV12_OVERLAY?"YV12":
 			overlay->format==SDL_IYUV_OVERLAY?"IYUV":
 		case SDL_IYUV_OVERLAY:
 			ConvertRGBtoIYUV(pic,overlay,monochrome,luminance);
 			break;
 		default:
 			printf("cannot convert RGB picture to obtained YUV format!\n");
-			exit(1);
+			quit(1);
 			break;
 	}
 #ifdef BENCHMARK_SDL
 	now = SDL_GetTicks();
 	printf("Conversion Time: %d milliseconds\n", now-then);
 #ifdef BENCHMARK_SDL
 	now = SDL_GetTicks();
 	printf("Time: %d milliseconds\n", now-then);
 #endif
 	SDL_Delay(delay*1000);
+	SDL_Quit();
 	return(0);
 }

Mercurial > sdl-ios-xcode

comparison test/testoverlay.c @ 1151:be9c9c8f6d53