From 7b4aa849793e3e092c0d2f60de52c8d8cfa16624 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 7 Jun 2001 15:04:04 +0000 Subject: [PATCH] Oops, back it out... --- src/video/SDL_pixels.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c index 12c35f013..9625adc8a 100644 --- a/src/video/SDL_pixels.c +++ b/src/video/SDL_pixels.c @@ -464,6 +464,7 @@ static Uint8 *Map1toN(SDL_Palette *src, SDL_PixelFormat *dst) Uint8 *map; int i; int bpp; + unsigned alpha; bpp = ((dst->BytesPerPixel == 3) ? 4 : dst->BytesPerPixel); map = (Uint8 *)malloc(src->ncolors*bpp); @@ -472,11 +473,12 @@ static Uint8 *Map1toN(SDL_Palette *src, SDL_PixelFormat *dst) return(NULL); } + alpha = dst->Amask ? SDL_ALPHA_OPAQUE : 0; /* We memory copy to the pixel map so the endianness is preserved */ for ( i=0; incolors; ++i ) { ASSEMBLE_RGBA(&map[i*bpp], dst->BytesPerPixel, dst, src->colors[i].r, src->colors[i].g, - src->colors[i].b, SDL_ALPHA_OPAQUE); + src->colors[i].b, alpha); } return(map); }