summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-05-14 20:13:45 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-05-14 20:13:45 +0000
commitf58a54668b96884ece6ecbff732e880677d5d19e (patch)
tree36dbcb9c0fd5391e9ee45cacb4cd165d72fd4dfb
parenta9d820b454bbb418d04e1d3c3d5d4dd10d7bb3af (diff)
Change return statements to fix compiler errors: "fbcompose.c", line 2815:XORG-6_8_99_7
void function cannot return value "fbcompose.c", line 2861: void function cannot return value
-rw-r--r--fb/fbcompose.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index a45e4d64e..9085c6a86 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -2811,8 +2811,10 @@ static void fbFetchExternalAlpha(PicturePtr pict, int x, int y, int width, CARD3
int i;
CARD32 alpha_buffer[SCANLINE_BUFFER_LENGTH];
- if (!pict->alphaMap)
- return fbFetchTransformed(pict, x, y, width, buffer);
+ if (!pict->alphaMap) {
+ fbFetchTransformed(pict, x, y, width, buffer);
+ return;
+ }
fbFetchTransformed(pict, x, y, width, buffer);
fbFetchTransformed(pict->alphaMap, x - pict->alphaOrigin.x, y - pict->alphaOrigin.y, width, alpha_buffer);
@@ -2857,8 +2859,10 @@ static void fbStoreExternalAlpha(PicturePtr pict, int x, int y, int width, CARD3
miIndexedPtr indexed = (miIndexedPtr) pict->pFormat->index.devPrivate;
miIndexedPtr aindexed;
- if (!pict->alphaMap)
- return fbStore(pict, x, y, width, buffer);
+ if (!pict->alphaMap) {
+ fbStore(pict, x, y, width, buffer);
+ return;
+ }
store = storeProcForPicture(pict);
astore = storeProcForPicture(pict->alphaMap);