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

Fixed initializing pixel format for indexed formats

Browse source
This commit is contained in:
Sam Lantinga 2011-03-06 21:34:45 -08:00
parent d60c96a568
commit 61b11f87da
1 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/video/SDL_pixels.c
View file

@ -444,22 +444,36 @@ SDL_AllocFormat(Uint32 pixel_format)
int int
SDL_InitFormat(SDL_PixelFormat * format, Uint32 pixel_format) SDL_InitFormat(SDL_PixelFormat * format, Uint32 pixel_format)
{ {
int bpp;
Uint32 Rmask, Gmask, Bmask, Amask;
Uint32 mask;
if (!SDL_PixelFormatEnumToMasks(pixel_format, &bpp,
&Rmask, &Gmask, &Bmask, &Amask)) {
SDL_SetError("Unknown pixel format");
return -1;
}
/* Set up the format */ /* Set up the format */
SDL_zerop(format); SDL_zerop(format);
format->format = pixel_format; format->format = pixel_format;
format->BitsPerPixel = bpp; format->BitsPerPixel = SDL_BITSPERPIXEL(pixel_format);
format->BytesPerPixel = (bpp + 7) / 8; format->BytesPerPixel = SDL_BYTESPERPIXEL(pixel_format);
if (Rmask || Bmask || Gmask) { /* Packed pixels with custom mask */ if (SDL_ISPIXELFORMAT_INDEXED(pixel_format)) {
/* Palettized formats have no mask info */
format->Rloss = 8;
format->Gloss = 8;
format->Bloss = 8;
format->Aloss = 8;
format->Rshift = 0;
format->Gshift = 0;
format->Bshift = 0;
format->Ashift = 0;
format->Rmask = 0;
format->Gmask = 0;
format->Bmask = 0;
format->Amask = 0;
} else {
int bpp;
Uint32 Rmask, Gmask, Bmask, Amask;
Uint32 mask;
if (!SDL_PixelFormatEnumToMasks(pixel_format, &bpp,
&Rmask, &Gmask, &Bmask, &Amask)) {
SDL_SetError("Unknown pixel format");
return -1;
}
format->Rshift = 0; format->Rshift = 0;
format->Rloss = 8; format->Rloss = 8;
if (Rmask) { if (Rmask) {
@ -496,33 +510,6 @@ SDL_InitFormat(SDL_PixelFormat * format, Uint32 pixel_format)
format->Gmask = Gmask; format->Gmask = Gmask;
format->Bmask = Bmask; format->Bmask = Bmask;
format->Amask = Amask; format->Amask = Amask;
} else if (bpp > 8) { /* Packed pixels with standard mask */
/* R-G-B */
if (bpp > 24)
bpp = 24;
format->Rloss = 8 - (bpp / 3);
format->Gloss = 8 - (bpp / 3) - (bpp % 3);
format->Bloss = 8 - (bpp / 3);
format->Rshift = ((bpp / 3) + (bpp % 3)) + (bpp / 3);
format->Gshift = (bpp / 3);
format->Bshift = 0;
format->Rmask = ((0xFF >> format->Rloss) << format->Rshift);
format->Gmask = ((0xFF >> format->Gloss) << format->Gshift);
format->Bmask = ((0xFF >> format->Bloss) << format->Bshift);
} else {
/* Palettized formats have no mask info */
format->Rloss = 8;
format->Gloss = 8;
format->Bloss = 8;
format->Aloss = 8;
format->Rshift = 0;
format->Gshift = 0;
format->Bshift = 0;
format->Ashift = 0;
format->Rmask = 0;
format->Gmask = 0;
format->Bmask = 0;
format->Amask = 0;
} }
format->palette = NULL; format->palette = NULL;
format->refcount = 1; format->refcount = 1;