pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oops, back it out...

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%4051
This commit is contained in:
Sam Lantinga 2001-06-07 15:04:04 +00:00
parent e82590fade
commit a4fc83d5fc
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video/SDL_pixels.c
View file

@ -464,6 +464,7 @@ static Uint8 *Map1toN(SDL_Palette *src, SDL_PixelFormat *dst)
Uint8 *map; Uint8 *map;
int i; int i;
int bpp; int bpp;
unsigned alpha;
bpp = ((dst->BytesPerPixel == 3) ? 4 : dst->BytesPerPixel); bpp = ((dst->BytesPerPixel == 3) ? 4 : dst->BytesPerPixel);
map = (Uint8 *)malloc(src->ncolors*bpp); map = (Uint8 *)malloc(src->ncolors*bpp);
@ -472,11 +473,12 @@ static Uint8 *Map1toN(SDL_Palette *src, SDL_PixelFormat *dst)
return(NULL); return(NULL);
} }
alpha = dst->Amask ? SDL_ALPHA_OPAQUE : 0;
/* We memory copy to the pixel map so the endianness is preserved */ /* We memory copy to the pixel map so the endianness is preserved */
for ( i=0; i<src->ncolors; ++i ) { for ( i=0; i<src->ncolors; ++i ) {
ASSEMBLE_RGBA(&map[i*bpp], dst->BytesPerPixel, dst, ASSEMBLE_RGBA(&map[i*bpp], dst->BytesPerPixel, dst,
src->colors[i].r, src->colors[i].g, src->colors[i].r, src->colors[i].g,
src->colors[i].b, SDL_ALPHA_OPAQUE); src->colors[i].b, alpha);
} }
return(map); return(map);
} }