diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-11 09:29:50 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-11 11:02:05 +0100 |
| commit | eb9de37daaea45e917fa7f44444a9782070f7333 (patch) | |
| tree | d666cec70761715feff03a5908ff2fdf7fbe1325 /src/sna/fb | |
| parent | 085141348cfe8386059062a58172855f72d5e5b6 (diff) | |
sna: Silence compiler warnings for discarding const Region points
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/fb')
| -rw-r--r-- | src/sna/fb/fbbitmap.c | 4 | ||||
| -rw-r--r-- | src/sna/fb/fblinebits.h | 8 | ||||
| -rw-r--r-- | src/sna/fb/fbpoint.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/sna/fb/fbbitmap.c b/src/sna/fb/fbbitmap.c index 2ea92a99..a632abee 100644 --- a/src/sna/fb/fbbitmap.c +++ b/src/sna/fb/fbbitmap.c @@ -178,11 +178,11 @@ fbBitmapToRegion(PixmapPtr pixmap) } else region->extents.x1 = region->extents.x2 = 0; - DBG(("%s: region extents=(%d, %d), (%d, %d) x %ld\n", + DBG(("%s: region extents=(%d, %d), (%d, %d) x %d\n", __FUNCTION__, region->extents.x1, region->extents.y1, region->extents.x2, region->extents.y2, - (long)RegionNumRects(region))); + region_num_rects(region))); return region; } diff --git a/src/sna/fb/fblinebits.h b/src/sna/fb/fblinebits.h index 67e98e58..a4bc4fae 100644 --- a/src/sna/fb/fblinebits.h +++ b/src/sna/fb/fblinebits.h @@ -30,8 +30,8 @@ POLYLINE(DrawablePtr drawable, GCPtr gc, int mode, int n_0, DDXPointPtr pt_0) int xoff = drawable->x; int yoff = drawable->y; unsigned int bias = miGetZeroLineBias(drawable->pScreen); - const BoxRec *clip = RegionRects(gc->pCompositeClip); - const BoxRec *const last_clip = clip + RegionNumRects(gc->pCompositeClip); + const BoxRec *clip = region_rects(gc->pCompositeClip); + const BoxRec *const last_clip = clip + region_num_rects(gc->pCompositeClip); FbBits *dst; int dstStride; @@ -148,8 +148,8 @@ POLYSEGMENT(DrawablePtr drawable, GCPtr gc, int n_0, xSegment *seg_0) int xoff = drawable->x; int yoff = drawable->y; unsigned int bias = miGetZeroLineBias(drawable->pScreen); - const BoxRec *clip = RegionRects(gc->pCompositeClip); - const BoxRec *const last_clip = clip + RegionNumRects(gc->pCompositeClip); + const BoxRec *clip = region_rects(gc->pCompositeClip); + const BoxRec *const last_clip = clip + region_num_rects(gc->pCompositeClip); FbBits *dst; int dstStride; diff --git a/src/sna/fb/fbpoint.c b/src/sna/fb/fbpoint.c index c5f0f876..8ec5e559 100644 --- a/src/sna/fb/fbpoint.c +++ b/src/sna/fb/fbpoint.c @@ -93,10 +93,10 @@ fbPolyPoint(DrawablePtr drawable, GCPtr gc, int xoff, int yoff, FbBits and, FbBits xor); - DBG(("%s x %d, clip=[(%d, %d), (%d, %d)]x%ld\n", __FUNCTION__, n, + DBG(("%s x %d, clip=[(%d, %d), (%d, %d)]x%d\n", __FUNCTION__, n, gc->pCompositeClip->extents.x1, gc->pCompositeClip->extents.y1, gc->pCompositeClip->extents.x2, gc->pCompositeClip->extents.y2, - (long)RegionNumRects(gc->pCompositeClip))); + region_num_rects(gc->pCompositeClip))); if (mode == CoordModePrevious) fbFixCoordModePrevious(n, pt); |