Alexandre Julliard : winex11: Fix handling of bitmap header size for V4/ V5 bitmaps.

Alexandre Julliard julliard at winehq.org
Wed Apr 21 10:40:24 CDT 2010


Module: wine
Branch: master
Commit: 3f1c526ea261cb7847c5c74cd2fb278cd5dd1fe4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3f1c526ea261cb7847c5c74cd2fb278cd5dd1fe4

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Apr 21 14:56:32 2010 +0200

winex11: Fix handling of bitmap header size for V4/V5 bitmaps.

---

 dlls/winex11.drv/dib.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c
index 4cdec0e..7a1aad7 100644
--- a/dlls/winex11.drv/dib.c
+++ b/dlls/winex11.drv/dib.c
@@ -208,7 +208,7 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse )
         if (!colors && (info->bmiHeader.biBitCount <= 8))
             colors = 1 << info->bmiHeader.biBitCount;
         if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3;
-        return sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) + colors *
+        return info->bmiHeader.biSize + masks * sizeof(DWORD) + colors *
                ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD));
     }
 }




More information about the wine-cvs mailing list