Simplify and fix calculation of biCompression in GreGetDIBitsInternal

svn path=/trunk/; revision=65892
This commit is contained in:
Timo Kreuzer 2014-12-29 14:16:16 +00:00
parent 7c39a4ecb6
commit 2bcae18ec6

View File

@ -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;
}