wineps: Simplify the DIB byte width computation.

oldstable
Alexandre Julliard 2011-08-29 12:03:17 +02:00
parent 16944f500d
commit 6fd40e3cae
1 changed files with 1 additions and 16 deletions

View File

@ -31,22 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
/* Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. */
static inline int get_dib_width_bytes( int width, int depth )
{
int words;
switch(depth)
{
case 1: words = (width + 31) / 32; break;
case 4: words = (width + 7) / 8; break;
case 8: words = (width + 3) / 4; break;
case 15:
case 16: words = (width + 1) / 2; break;
case 24: words = (width * 3 + 3)/4; break;
default:
WARN("(%d): Unsupported depth\n", depth );
/* fall through */
case 32: words = width; break;
}
return 4 * words;
return ((width * depth + 31) / 8) & ~3;
}