commit 84dd9feb050a4edefeb7f2d88c1906fb54e62631
author Huw D M Davies <daviesh@abacus.physics.ox.ac.uk> Sun Nov 01 15:13:53 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Nov 01 15:13:53 1998 +0000
tree 4d2df7496af0d18a8366504bdb91ac79b182ff7c
parent 3700777e9a178580631fc83a44ded79d3c17ddc3

A couple of small fixes to my bitmap patch.

graphics/x11drv/bitmap.c

diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c
index 128a32e..6c46061 100644
--- a/graphics/x11drv/bitmap.c
+++ b/graphics/x11drv/bitmap.c
@@ -28,11 +28,6 @@
 GC BITMAP_monoGC = 0, BITMAP_colorGC = 0;
 
 
-#define BITMAP_WIDTH_BYTES(width,bpp) \
-    (((bpp) == 24) ? (width) * 4 : ( ((bpp) == 15) ? (width) * 2 : \
-				    ((width) * (bpp) + 15) / 16 * 2 ))
-
-
 /***********************************************************************
  *           X11DRV_BITMAP_Init
  */
@@ -371,6 +366,8 @@
     XImage *image;
     LPBYTE sbuf, tmpbuffer;
     int	w, h, pad, widthbytes;
+
+    TRACE(x11drv, "(bmp=%p, bits=%p, count=%lx)\n", bmp, bits, count);
     
     pad = BITMAP_GetBitsPadding(bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel);
 
@@ -381,9 +378,12 @@
 
     widthbytes	= (((bmp->bitmap.bmWidth * bmp->bitmap.bmBitsPixel) + 31) /
 		   32) * 4;
-    height      = bmp->bitmap.bmHeight;
+    height      = count / bmp->bitmap.bmWidthBytes;
     tmpbuffer	= (LPBYTE)xmalloc(widthbytes*height);
 
+    TRACE(x11drv, "h=%ld, w=%d, wb=%d\n", height, bmp->bitmap.bmWidth, 
+	  widthbytes);
+
     EnterCriticalSection( &X11DRV_CritSection );
     image = XCreateImage( display, DefaultVisualOfScreen(screen),
                           bmp->bitmap.bmBitsPixel, ZPixmap, 0, tmpbuffer,