Merge remote-tracking branch 'jcristau/for-keith'

This commit is contained in:
Keith Packard
2011-12-01 14:44:52 +00:00

View File

@@ -481,7 +481,7 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
{
PixmapPtr pPixmap;
if (format == ZPixmap || depth == 1) {
if (format == ZPixmap || (format == XYPixmap && depth == 1)) {
pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
BitsPerPixel(depth),
PixmapBytePad(w, depth),