Attachment 29667 Details for Bug 23298 – Possible fix

[patch] Possible fix

fdo23298.diff (text/plain), 1.58 KB, created by Michel Dänzer on 2009-09-18 05:58:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2009-09-18 05:58:43 UTC

Size: 1.58 KB

patch

obsolete

>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

Actions: View | Splinter Review

Attachments on bug 23298: 29650 | 29667

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.