From 6db5b783fe5ee33de6df15e19e795d4ae3045af6 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Wed, 23 Dec 2009 06:39:18 +0000
Subject: [PATCH] Fixed bug #912

SDL_MasksToPixelFormatEnum() wasn't correctly returning RGB24 formats
---
 src/video/SDL_pixels.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c
index a9c1145db..5a4ba11df 100644
--- a/src/video/SDL_pixels.c
+++ b/src/video/SDL_pixels.c
@@ -239,9 +239,17 @@ SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
     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          */