summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-20 10:54:32 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-20 10:54:32 +0930
commite73a03d589b47ac9131f3932da7f78d2fef7bfb5 (patch)
treeb8b159c518cebbc46d200ccb691a517341e75d3c
parent99d28c3ef37aeffe7d8ec41e45a650ba248c6958 (diff)
fb: shut up two compiler warnings.
-rw-r--r--fb/fbarc.c2
-rw-r--r--fb/fbpict.c2
2 files changed, 3 insertions, 1 deletions
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,