[ros-diffs] [tkreuzer] 65892: [WIN32K] Simplify and fix calculation of biCompression in GreGetDIBitsInternal

[tkreuzer]

Author: tkreuzer
Date: Mon Dec 29 14:16:16 2014
New Revision: 65892

URL: http://svn.reactos.org/svn/reactos?rev=65892&view=rev
Log:
[WIN32K]
Simplify and fix calculation of biCompression in GreGetDIBitsInternal

Modified:
    trunk/reactos/win32ss/gdi/ntgdi/dibobj.c

Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c?rev=65892&r1=65891&r2=65892&view=diff
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c    [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c    [iso-8859-1] Mon Dec 29 
14:16:16 2014
@@ -737,20 +737,9 @@
         Info->bmiHeader.biSizeImage = DIB_GetDIBImageBytes( 
Info->bmiHeader.biWidth,
                                       Info->bmiHeader.biHeight,
                                       Info->bmiHeader.biBitCount);
-        if(psurf->hSecure)
-        {
-            switch(Info->bmiHeader.biBitCount)
-            {
-            case 16:
-            case 32:
-                Info->bmiHeader.biCompression = BI_BITFIELDS;
-                break;
-            default:
-                Info->bmiHeader.biCompression = BI_RGB;
-                break;
-            }
-        }
-        else if(Info->bmiHeader.biBitCount > 8)
+
+        if ((Info->bmiHeader.biBitCount == 16) ||
+            (Info->bmiHeader.biBitCount == 32))
         {
             Info->bmiHeader.biCompression = BI_BITFIELDS;
         }