commit dee464c4c6a0b299dcc41aa40bafd27dbfb4137c
author Karl Lessard <karll@corel.com> Tue Sep 14 11:51:01 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 14 11:51:01 1999 +0000
tree dd981e9207ecbdf55255cecf8e066da4288797b9
parent 32b4325d6bc0e48a1fb9b3122cce0c14cbed0c30

Fixed GetDIBits problems.

objects/dib.c

diff --git a/objects/dib.c b/objects/dib.c
index c13a531..8ddbe1e 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -535,7 +535,7 @@
     if (bits && lines)
     {
         /* If the bitmap object already have a dib section that contains image data, get the bits from it*/
-        if(bmp->dib->dsBm.bmBits && bmp->dib->dsBm.bmBitsPixel >= 16 && info->bmiHeader.biBitCount >= 16)
+        if(bmp->dib && bmp->dib->dsBm.bmBitsPixel >= 15 && info->bmiHeader.biBitCount >= 15)
         {
             /*FIXME: Only RGB dibs supported for now */
             int srcwidth = bmp->dib->dsBm.bmWidth, srcwidthb = bmp->dib->dsBm.bmWidthBytes;
@@ -545,12 +545,13 @@
 
             if ((info->bmiHeader.biHeight < 0) ^ (bmp->dib->dsBmih.biHeight < 0))
             {
-                dbits = bits + (dstwidthb * lines);
+                dbits = bits + (dstwidthb * (lines-1));
                 dstwidthb = -dstwidthb;
             }
 
             switch( info->bmiHeader.biBitCount ) {
 
+	    case 15:
             case 16: /* 16 bpp dstDIB */
                 {
                     LPWORD dstbits = (LPWORD)dbits;