# HG changeset patch # User Sam Lantinga # Date 1261550358 0 # Node ID 7dec3fe9b580d10ddecabaa6bd61b86682de100a # Parent f638ded38b8a10d99e62d2bfc06404155adc4305 Fixed bug #912 SDL_MasksToPixelFormatEnum() wasn't correctly returning RGB24 formats diff -r f638ded38b8a -r 7dec3fe9b580 src/video/SDL_pixels.c --- a/src/video/SDL_pixels.c Wed Dec 23 01:55:00 2009 +0000 +++ b/src/video/SDL_pixels.c Wed Dec 23 06:39:18 2009 +0000 @@ -239,9 +239,17 @@ case 24: switch (Rmask) { case 0x00FF0000: - return SDL_PIXELFORMAT_RGB888; +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + return SDL_PIXELFORMAT_RGB24; +#else + return SDL_PIXELFORMAT_BGR24; +#endif case 0x000000FF: - return SDL_PIXELFORMAT_BGR888; +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + return SDL_PIXELFORMAT_BGR24; +#else + return SDL_PIXELFORMAT_RGB24; +#endif case 0x00000000: /* FIXME: At this point we can't distinguish */ /* if this format is RGB24 or BGR24 */