From 66e12a837e2cb92794307d0b8d28f80d54f0094d Mon Sep 17 00:00:00 2001 From: Albert Cahalan Date: Fri, 10 Dec 2004 01:05:10 +0000 Subject: [PATCH] narrowed down the massive starter bug to load_starter, maybe involving SDL_CreateRGBSurface or SDL_SetAlpha --- src/tuxpaint.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index ebace67a8..7266d4dfd 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -9483,6 +9483,7 @@ static void load_starter(char * img_id) SDL_FreeSurface(tmp_surf); } +#if 0 if (img_starter != NULL && (img_starter->w != canvas->w || img_starter->h != canvas->h)) { @@ -9496,10 +9497,12 @@ static void load_starter(char * img_id) tmp_surf->format->Bmask, tmp_surf->format->Amask); - SDL_SetAlpha(tmp_surf, 0, 0); + // 3rd arg ignored for RGBA surfaces + SDL_SetAlpha(tmp_surf, SDL_RLEACCEL, SDL_ALPHA_OPAQUE); autoscale_copy_smear_free(tmp_surf,img_starter); + SDL_SetAlpha(img_starter, SDL_RLEACCEL|SDL_SRCALPHA, SDL_ALPHA_OPAQUE); } - +#endif /* Try to load the a background image: */ @@ -11942,6 +11945,7 @@ static int do_open(int want_new_tool) strcpy(starter_id, d_names[which]); load_starter(starter_id); + SDL_FillRect(canvas, NULL, SDL_MapRGB(canvas->format, 255, 255, 255)); SDL_BlitSurface(img_starter_bkgd, NULL, canvas, NULL); SDL_BlitSurface(img_starter, NULL, canvas, NULL); }