diff options
| author | Keith Packard <keithp@keithp.com> | 2011-12-01 14:44:52 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-12-01 14:44:52 +0000 |
| commit | 05f09354a30a4f5edd421220e1aa97be754c71bb (patch) | |
| tree | 5d2bb1b9016c2b6910eb27027519622b27f7e91f | |
| parent | 3197b773c81e58cd4aa412eccaee49526012ed6f (diff) | |
| parent | 08ec4da6a7617637914bee1636858474213cf39d (diff) | |
Merge remote-tracking branch 'jcristau/for-keith'
| -rw-r--r-- | Xext/shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/shm.c b/Xext/shm.c index 9c8beb27c..7ca027a90 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -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), |