[ros-diffs] [tkreuzer] 50932: [WIN32K] addendum to r50928: 24 and 32bpp BI_RGB bitmaps are BGR

[tkreuzer]

Author: tkreuzer
Date: Mon Feb 28 00:48:19 2011
New Revision: 50932

URL: http://svn.reactos.org/svn/reactos?rev=50932&view=rev
Log:
[WIN32K]
addendum to r50928: 24 and 32bpp BI_RGB bitmaps are BGR

Modified:
    trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c

Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c?rev=50932&r1=50931&r2=50932&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] 
(original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Mon 
Feb 28 00:48:19 2011
@@ -929,7 +929,6 @@
                 case BMF_1BPP:
                 case BMF_4BPP:
                 case BMF_8BPP:
-                case BMF_24BPP:
                    pds->dsBmih.biCompression = BI_RGB;
                    break;
 
@@ -940,8 +939,10 @@
                         pds->dsBmih.biCompression = BI_BITFIELDS;
                     break;
 
+                case BMF_24BPP:
                 case BMF_32BPP:
-                    if (psurf->ppal->flFlags & (PAL_RGB|PAL_BGR))
+                    /* 24/32bpp BI_RGB is actually BGR format */
+                    if (psurf->ppal->flFlags & PAL_BGR)
                         pds->dsBmih.biCompression = BI_RGB;
                     else
                         pds->dsBmih.biCompression = BI_BITFIELDS;