From e73a03d589b47ac9131f3932da7f78d2fef7bfb5 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 20 May 2008 10:54:32 +0930
Subject: [PATCH] fb: shut up two compiler warnings.

---
 fb/fbarc.c  | 2 ++
 fb/fbpict.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fb/fbarc.c b/fb/fbarc.c
index f89b81c52..3a8a2c56a 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -77,6 +77,8 @@ fbPolyArc (DrawablePtr	pDrawable,
 	    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
 #ifdef FB_ACCESS_WRAPPER
 	    wrapped = 1;
+#else
+	    wrapped = 0;
 #endif
 	    while (narcs--)
 	    {
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 85b5171c5..1355e9071 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -292,7 +292,7 @@ create_bits_picture (PicturePtr pict,
     
     fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
 
-    bits = (CARD8*)bits + yoff * stride * sizeof(FbBits) + xoff * (bpp / 8);
+    bits = (FbBits*)((CARD8*)bits + yoff * stride * sizeof(FbBits) + xoff * (bpp / 8));
 
     image = pixman_image_create_bits (
 	pict->format,