--- a/test/testshape.c	Sun Jul 18 22:24:52 2010 -0400
+++ b/test/testshape.c	Sun Jul 18 23:05:40 2010 -0400
@@ -27,8 +27,8 @@
 	for(i=0;i<num_pictures;i++)
 		pictures[i] = NULL;
 	for(i=0;i<num_pictures;i++) {
-		SDL_Surface *original = SDL_LoadBMP(argv[i+1]);
-		if(original == NULL) {
+		pictures[i] = SDL_LoadBMP(argv[i+1]);
+		if(pictures[i] == NULL) {
 			int j = 0;
 			for(j=0;j<num_pictures;j++)
 				if(pictures[j] != NULL)
@@ -38,43 +38,6 @@
 			printf("Could not load surface from named bitmap file.\n");
 			exit(-3);
 		}
-		//THIS CONVERSION ROUTINE IS FRAGILE!  It relies in the fact that only certain portions of the format structure must be filled in to use it.
-		SDL_PixelFormat format = {NULL,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-		int bpp = 0;
-		SDL_PixelFormatEnumToMasks(SDL_PIXELFORMAT_RGBA8888,&bpp,&format.Rmask,&format.Gmask,&format.Bmask,&format.Amask);
-		format.BitsPerPixel = bpp;
-		format.BytesPerPixel = format.BitsPerPixel / 8 + (format.BitsPerPixel % 8 > 0 ? 1 : 0);
-		pictures[i] = SDL_ConvertSurface(original,&format,0);
-		//We have no more need of the original now that we have our desired format.
-		SDL_FreeSurface(original);
-		if(pictures[i] == NULL) {
-			int j = 0;
-			for(j=0;j<num_pictures;j++)
-				if(pictures[j] != NULL)
-					SDL_FreeSurface(pictures[j]);
-			free(pictures);
-			SDL_VideoQuit();
-			printf("Could not convert bitmap surface to desired format.\n");
-			exit(-3);
-		}
-		
-		if(SDL_MUSTLOCK(pictures[i]))
-			SDL_LockSurface(pictures[i]);
-			
-		void* pixels = pictures[i]->pixels;
-		unsigned int pitch = pictures[i]->pitch;
-		int y =0,x = 0;
-		for(y=0;y<pictures[i]->h;y++)
-			for(x=0;x<pictures[i]->w;x++) {
-				Uint32* pixel = pixels + y * pitch + x * pictures[i]->format->BytesPerPixel;
-				Uint8 r = 0,g = 0,b = 0;
-				SDL_GetRGB(*pixel,pictures[i]->format,&r,&g,&b);
-				//if(r == g == b == 0xff)
-				//	*pixel = SDL_MapRGBA(pictures[i]->format,r,g,b,0);
-			}
-			
-		if(SDL_MUSTLOCK(pictures[i]))
-			SDL_UnlockSurface(pictures[i]);
 	}
 	
 	SDL_Window *window = SDL_CreateShapedWindow("SDL_Shape test",SHAPED_WINDOW_X,SHAPED_WINDOW_Y,SHAPED_WINDOW_DIMENSION,SHAPED_WINDOW_DIMENSION,SDL_WINDOW_RESIZABLE | SDL_WINDOW_SHOWN);
@@ -123,12 +86,12 @@
 	event_pending = SDL_PollEvent(&event);
 	unsigned int current_picture = 0;
 	SDL_WindowShapeMode mode = {ShapeModeDefault,1};
-	SDL_SetWindowShape(window,pictures[current_picture],&mode);
 	int mouse_down = 0;
-	Uint32 format,access;
+	Uint32 format = 0,access = 0;
 	SDL_Rect texture_dimensions = {0,0,0,0};
 	SDL_QueryTexture(textures[current_picture],&format,&access,&texture_dimensions.w,&texture_dimensions.h);
 	SDL_SetWindowSize(window,texture_dimensions.w,texture_dimensions.h);
+	SDL_SetWindowShape(window,pictures[current_picture],&mode);
 	while(should_exit == 0) {
 		event_pending = SDL_PollEvent(&event);
 		if(event_pending == 1) {