From 0dae479e16590e767df35985150c5acf696e5df2 Mon Sep 17 00:00:00 2001 From: Søren Sandmann Pedersen Date: Mon, 1 Nov 2010 22:17:08 -0400 Subject: fb: Delete fbCompositeGeneral() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function was an unused and trivial wrapper around fbComposite(). Reviewed-by: Aaron Plattner Reviewed-by: Mikhail Gusarov Signed-off-by: Søren Sandmann --- fb/fbpict.c | 19 ------------------- fb/fbpict.h | 16 ---------------- 2 files changed, 35 deletions(-) (limited to 'fb') diff --git a/fb/fbpict.c b/fb/fbpict.c index 3bc141bcd..7636040c6 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -76,25 +76,6 @@ fbComposite (CARD8 op, free_pixman_pict (pDst, dest); } -void -fbCompositeGeneral (CARD8 op, - PicturePtr pSrc, - PicturePtr pMask, - PicturePtr pDst, - INT16 xSrc, - INT16 ySrc, - INT16 xMask, - INT16 yMask, - INT16 xDst, - INT16 yDst, - CARD16 width, - CARD16 height) -{ - fbComposite (op, pSrc, pMask, pDst, - xSrc, ySrc, xMask, yMask, xDst, yDst, - width, height); -} - static pixman_image_t * create_solid_fill_image (PicturePtr pict) { diff --git a/fb/fbpict.h b/fb/fbpict.h index 34a3eae2a..b02b95068 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -395,22 +395,6 @@ typedef struct _FbComposeFunctions { CombineMaskU combineMaskU; } FbComposeFunctions; -/* fbcompose.c */ - -extern _X_EXPORT void -fbCompositeGeneral (CARD8 op, - PicturePtr pSrc, - PicturePtr pMask, - PicturePtr pDst, - INT16 xSrc, - INT16 ySrc, - INT16 xMask, - INT16 yMask, - INT16 xDst, - INT16 yDst, - CARD16 width, - CARD16 height); - /* fbpict.c */ extern _X_EXPORT void fbComposite (CARD8 op, -- cgit v1.2.3