From fc37f8fcb20663159d2a8cef6c9bfca039465534 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 20 Jun 2008 13:27:32 -0400 Subject: [PATCH] Bug #12414: Create full-fledged pixmaps in fb24_32ReformatTile(). ... instead of creating pixmaps that only fb knows about, which will have no devPrivates for any other subsystem and thus cause havoc if (when) they leak out. (cherry picked from commit b55fbca4f0705aeff1c69d3ef851c5ff5af6ed94) --- fb/fb24_32.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fb/fb24_32.c b/fb/fb24_32.c index a03726b8d..1ebd598a8 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -1,5 +1,4 @@ /* - * * Copyright © 2000 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -544,11 +543,10 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel) int oldXoff, oldYoff; int newXoff, newYoff; - pNewTile = fbCreatePixmapBpp (pScreen, - pOldTile->drawable.width, - pOldTile->drawable.height, - pOldTile->drawable.depth, - bitsPerPixel, 0); + pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width, + pOldTile->drawable.height, + pOldTile->drawable.depth, + pOldTile->usage_hint); if (!pNewTile) return 0; fbGetDrawable (&pOldTile->drawable,