summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-06-14 17:09:07 -0700
committerAdam Jackson <ajax@redhat.com>2016-07-06 13:35:30 -0400
commitbe8eb5c4a1dda472d54f96bd54ee3e9421daf2e7 (patch)
tree7e344caea4a6d9e63caad7624b0ac9f107c10304
parent5c549168a2947c56727a7546baee21d04c46d563 (diff)
glamor: Use DestroyPixmap instead of FreePicture for glyph atlas pixmap
Nice of FreePicture to take a void * instead of a PicturPtr so that this error wasn't caught by the compiler. Noticed when resetting the X server left a dangling pixmap around. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (cherry picked from commit 2d6230e77348e550c90e00c007b113ce38c81d12)
-rw-r--r--glamor/glamor_composite_glyphs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c
index 50fd02645..cc0aa6f37 100644
--- a/glamor/glamor_composite_glyphs.c
+++ b/glamor/glamor_composite_glyphs.c
@@ -557,7 +557,7 @@ glamor_free_glyph_atlas(struct glamor_glyph_atlas *atlas)
if (!atlas)
return;
if (atlas->atlas)
- FreePicture(atlas->atlas, 0);
+ (*atlas->atlas->drawable.pScreen->DestroyPixmap)(atlas->atlas);
free (atlas);
}