frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Keith Packard 2011-12-01 14:44:52 +00:00
parent 3197b773c8 08ec4da6a7
commit 05f09354a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/shm.c
View File

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