xserver: Branch 'master'

[Alan Hourihane]

 exa/exa_accel.c |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 57468a696e1259c1e1c185fc60230e1d195defb7
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Fri Jan 4 12:37:55 2008 +0000

    Fix Line drawing with CapNotLast set in PolySegment.

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index ae951ed..c2bfdee 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -739,6 +739,14 @@ exaPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg,
 	    prect[i].y = pSeg[i].y2;
 	    prect[i].height = pSeg[i].y1 - pSeg[i].y2 + 1;
 	}
+
+	/* don't paint last pixel */
+	if (pGC->capStyle == CapNotLast) {
+	    if (prect[i].width == 1)
+		prect[i].height--;
+	    else
+		prect[i].width--;
+	}
     }
     pGC->ops->PolyFillRect(pDrawable, pGC, nseg, prect);
     xfree(prect);