# HG changeset patch # User Sam Lantinga # Date 1253486848 0 # Node ID 2b95b2c0b6d47a98630b9e368ed2184013e39ecb # Parent 1ed5d432e468e6ad27914f016b55fd0a9c2dd29d Fixed compatibility with SDL 1.2 pixel format (24 bits per pixel of color data with 4 bytes per pixel == 32 bpp) diff -r 1ed5d432e468 -r 2b95b2c0b6d4 src/video/SDL_pixels.c --- a/src/video/SDL_pixels.c Sun Sep 20 04:15:19 2009 +0000 +++ b/src/video/SDL_pixels.c Sun Sep 20 22:47:28 2009 +0000 @@ -39,10 +39,10 @@ Uint32 masks[4]; /* Initialize the values here */ - if (SDL_BYTESPERPIXEL(format) == 3) { + if (SDL_BYTESPERPIXEL(format) <= 2) { + *bpp = SDL_BITSPERPIXEL(format); + } else { *bpp = SDL_BYTESPERPIXEL(format) * 8; - } else { - *bpp = SDL_BITSPERPIXEL(format); } *Rmask = *Gmask = *Bmask = *Amask = 0;