From 2bcae18ec670cfb2c32c3193374468fb80731027 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 29 Dec 2014 14:16:16 +0000 Subject: [PATCH] [WIN32K] Simplify and fix calculation of biCompression in GreGetDIBitsInternal svn path=/trunk/; revision=65892 --- reactos/win32ss/gdi/ntgdi/dibobj.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/reactos/win32ss/gdi/ntgdi/dibobj.c b/reactos/win32ss/gdi/ntgdi/dibobj.c index 23dee364c40..faa7f0c937f 100644 --- a/reactos/win32ss/gdi/ntgdi/dibobj.c +++ b/reactos/win32ss/gdi/ntgdi/dibobj.c @@ -737,20 +737,9 @@ GreGetDIBitsInternal( 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; }