From a90ee792d96752ad1b71b9ada922fa6afe478c99 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sun, 5 Dec 2010 15:36:12 +0000 Subject: Upgrade to xorg-server 1.9.2. Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations including multihead with both zaphod and xrandr. --- xserver/fb/fbfillrect.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'xserver/fb/fbfillrect.c') diff --git a/xserver/fb/fbfillrect.c b/xserver/fb/fbfillrect.c index f404044c5..7fc03f9a5 100644 --- a/xserver/fb/fbfillrect.c +++ b/xserver/fb/fbfillrect.c @@ -1,6 +1,4 @@ /* - * Id: fbfillrect.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -46,7 +44,7 @@ fbPolyFillRect(DrawablePtr pDrawable, xorg = pDrawable->x; yorg = pDrawable->y; - pextent = REGION_EXTENTS(pGC->pScreen, pClip); + pextent = RegionExtents(pClip); extentX1 = pextent->x1; extentY1 = pextent->y1; extentX2 = pextent->x2; @@ -73,7 +71,7 @@ fbPolyFillRect(DrawablePtr pDrawable, if ((fullX1 >= fullX2) || (fullY1 >= fullY2)) continue; - n = REGION_NUM_RECTS (pClip); + n = RegionNumRects (pClip); if (n == 1) { fbFill (pDrawable, @@ -82,7 +80,7 @@ fbPolyFillRect(DrawablePtr pDrawable, } else { - pbox = REGION_RECTS(pClip); + pbox = RegionRects(pClip); /* * clip the rectangle to each box in the clip region * this is logically equivalent to calling Intersect() -- cgit v1.2.3