SOURCES: xorg-xserver-server-exa.patch - latest fix

[arekm]

Author: arekm                        Date: Sat Nov  8 00:50:32 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- latest fix

---- Files affected:
SOURCES:
   xorg-xserver-server-exa.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/xorg-xserver-server-exa.patch
diff -u SOURCES/xorg-xserver-server-exa.patch:1.4 SOURCES/xorg-xserver-server-exa.patch:1.5
--- SOURCES/xorg-xserver-server-exa.patch:1.4	Wed Nov  5 22:12:09 2008
+++ SOURCES/xorg-xserver-server-exa.patch	Sat Nov  8 01:50:27 2008
@@ -2120,3 +2120,39 @@
 -- 
 1.5.5.1
 
+commit 21c116219cd5c6845a0955f2d88fdb5fab5c17cf
+Author: Michel Dänzer <michel at tungstengraphics.com>
+Date:   Sat Nov 8 01:25:14 2008 +0100
+
+    Fix typos which caused exaCompositeRects() to use an incorrect damage region.
+    
+    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=18065 .
+    
+    Also, it can bail if either width or height of the bounding box is <= 0, not
+    only if both of them are.
+
+diff --git a/exa/exa_render.c b/exa/exa_render.c
+index 199af36..45cfff7 100644
+--- a/exa/exa_render.c
++++ b/exa/exa_render.c
+@@ -492,17 +492,17 @@ exaCompositeRects(CARD8	              op,
+ 	r = rects;
+ 	while (n--) {
+ 	    int rect_x2 = r->xDst + r->width;
+-	    int rect_y2 = r->yDst + r->width;
++	    int rect_y2 = r->yDst + r->height;
+ 
+ 	    if (r->xDst < x1) x1 = r->xDst;
+-	    if (r->xDst < y1) y1 = r->xDst;
++	    if (r->yDst < y1) y1 = r->yDst;
+ 	    if (rect_x2 > x2) x2 = rect_x2;
+ 	    if (rect_y2 > y2) y2 = rect_y2;
+ 
+ 	    r++;
+ 	}
+ 
+-	if (x2 <= x1 && y2 <= y1)
++	if (x2 <= x1 || y2 <= y1)
+ 	    return;
+ 
+ 	box.x1 = x1;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-xserver-server-exa.patch?r1=1.4&r2=1.5&f=u