summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-10-12 13:33:08 (GMT)
committerChris Wilson <chris@chris-wilson.co.uk>2009-10-12 13:36:20 (GMT)
commit7e8f32d0a7279dce1976f87612833d9092554cfe (patch)
tree2283d9a81526ac8a65dc1caa98d068fabf47071a
parent1556c62e0336ea2fef866722ee44d2d188e318f3 (diff)
uxa: Free the ScratchPixmapHeader after its associated Picture
Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24459 Intel Driver > 2.8: Cairo rendering bug, triggered in QtCurve GTK engine Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--uxa/uxa-render.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 32ea379..8f0bd1f 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -346,8 +346,8 @@ uxa_picture_from_a1_pixman_image(ScreenPtr pScreen, pixman_image_t * image)
pSrc = CreatePicture(0, &pPixmap->drawable,
PictureMatchFormat(pScreen, 1, PICT_a1),
0, 0, serverClient, &error);
- FreeScratchPixmapHeader(pPixmap);
if (!pSrc) {
+ FreeScratchPixmapHeader(pPixmap);
FreePicture(pPicture, 0);
return 0;
}
@@ -356,6 +356,7 @@ uxa_picture_from_a1_pixman_image(ScreenPtr pScreen, pixman_image_t * image)
0, 0, 0, 0, 0, 0, width, height);
FreePicture(pSrc, 0);
+ FreeScratchPixmapHeader(pPixmap);
return pPicture;
}