From 8d29fa9877d8649a8fa6adcafbcdfb06ee8eb938 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 23 Oct 1999 19:53:57 +0000 Subject: [PATCH] Re-applied lost change. --- graphics/x11drv/dib.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c index 61291ad2c3b..24e71a6b249 100644 --- a/graphics/x11drv/dib.c +++ b/graphics/x11drv/dib.c @@ -2678,9 +2678,9 @@ INT X11DRV_SetDIBitsToDevice( DC *dc, INT xDest, INT yDest, DWORD cx, case 1: case 4: case 8: - descr.colorMap = (RGBQUAD *)X11DRV_DIB_BuildColorMap( dc, coloruse, - dc->w.bitsPerPixel, - info, &descr.nColorMap ); + descr.colorMap = (RGBQUAD *)X11DRV_DIB_BuildColorMap( + coloruse == DIB_PAL_COLORS ? dc : NULL, coloruse, + dc->w.bitsPerPixel, info, &descr.nColorMap ); if (!descr.colorMap) return 0; descr.rMask = descr.gMask = descr.bMask = 0; break; @@ -2764,7 +2764,8 @@ INT X11DRV_DIB_SetDIBits( case 1: case 4: case 8: - descr.colorMap = (RGBQUAD *)X11DRV_DIB_BuildColorMap( descr.dc, coloruse, + descr.colorMap = (RGBQUAD *)X11DRV_DIB_BuildColorMap( + coloruse == DIB_PAL_COLORS ? descr.dc : NULL, coloruse, bmp->bitmap.bmBitsPixel, info, &descr.nColorMap ); if (!descr.colorMap) return 0; -- 2.11.4.GIT