forked from pool/xorg-x11-server
7e80a0dbbc
Copy from X11:XOrg/xorg-x11-server based on submit request 21255 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/21255 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=142
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
diff --git a/Xext/shm.c b/Xext/shm.c
|
|
index dd097e6..99bbd37 100644
|
|
--- a/Xext/shm.c
|
|
+++ b/Xext/shm.c
|
|
@@ -496,15 +496,40 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
|
|
char *data)
|
|
{
|
|
PixmapPtr pPixmap;
|
|
-
|
|
- pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
|
|
- BitsPerPixel(depth),
|
|
- PixmapBytePad(w, depth),
|
|
- data);
|
|
- if (!pPixmap)
|
|
- return;
|
|
- pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
|
|
- FreeScratchPixmapHeader(pPixmap);
|
|
+
|
|
+ if (format == ZPixmap || depth == 1) {
|
|
+ pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
|
|
+ BitsPerPixel(depth),
|
|
+ PixmapBytePad(w, depth),
|
|
+ data);
|
|
+ if (!pPixmap)
|
|
+ return;
|
|
+ pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
|
|
+ FreeScratchPixmapHeader(pPixmap);
|
|
+ } else {
|
|
+ GCPtr putGC = GetScratchGC(depth, dst->pScreen);
|
|
+
|
|
+ if (!putGC)
|
|
+ return;
|
|
+
|
|
+ pPixmap = (*dst->pScreen->CreatePixmap)(dst->pScreen, sw, sh, depth,
|
|
+ CREATE_PIXMAP_USAGE_SCRATCH);
|
|
+ if (!pPixmap) {
|
|
+ FreeScratchGC(putGC);
|
|
+ return;
|
|
+ }
|
|
+ ValidateGC(&pPixmap->drawable, putGC);
|
|
+ (*putGC->ops->PutImage)(&pPixmap->drawable, putGC, depth, -sx, -sy, w, h, 0,
|
|
+ (format == XYPixmap) ? XYPixmap : ZPixmap, data);
|
|
+ FreeScratchGC(putGC);
|
|
+ if (format == XYBitmap)
|
|
+ (void)(*pGC->ops->CopyPlane)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh,
|
|
+ dx, dy, 1L);
|
|
+ else
|
|
+ (void)(*pGC->ops->CopyArea)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh,
|
|
+ dx, dy);
|
|
+ (*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
|
|
+ }
|
|
}
|
|
|
|
#ifdef PANORAMIX
|