# HG changeset patch # User Sam Lantinga # Date 995019643 0 # Node ID 01fcac5d146e2bb0c74faa4dcf9b7f2b4d367c68 # Parent 63ec24e0575f10a03f4598233e5a74df5e9a231f Fixed crash in testsprite when using the -fast option (nobody caught this?) diff -r 63ec24e0575f -r 01fcac5d146e test/testsprite.c --- a/test/testsprite.c Fri Jul 13 10:19:51 2001 +0000 +++ b/test/testsprite.c Fri Jul 13 10:20:43 2001 +0000 @@ -92,7 +92,7 @@ } /* This is a way of telling whether or not to use hardware surfaces */ -Uint32 FastestFlags(Uint32 flags) +Uint32 FastestFlags(Uint32 flags, int width, int height, int bpp) { const SDL_VideoInfo *info; @@ -112,8 +112,7 @@ /* Direct hardware blitting without double-buffering causes really bad flickering. */ - SDL_Surface *screen = SDL_GetVideoSurface(); - if ( info->video_mem > (screen->h*screen->pitch) ) { + if ( info->video_mem*1024 > (height*width*bpp/8) ) { flags |= SDL_DOUBLEBUF; } else { flags &= ~SDL_HWSURFACE; @@ -164,7 +163,7 @@ --argc; } else if ( strcmp(argv[argc], "-fast") == 0 ) { - videoflags = FastestFlags(videoflags); + videoflags = FastestFlags(videoflags, width, height, video_bpp); } else if ( strcmp(argv[argc], "-hw") == 0 ) { videoflags ^= SDL_HWSURFACE;