[Commit] cairo/src cairo_traps.c,1.1,1.2

[Carl Worth]

Committed by: cworth

Update of /local/src/CVS/cairo/src
In directory home.keithp.com:/tmp/cvs-serv16270

Modified Files:
	cairo_traps.c 
Log Message:
Fixed polygon tesselattion for some cases of incorrect sorting when two intersections
are very near the same vertical position.

Index: cairo_traps.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_traps.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo_traps.c	18 Jul 2003 18:34:19 -0000	1.1
+++ cairo_traps.c	19 Jul 2003 12:19:32 -0000	1.2
@@ -533,14 +533,14 @@
 	    if (en && e->current_x != en->current_x)
 	    {
 		if (_lines_intersect (&e->edge, &en->edge, &intersect))
-		    if (intersect > y) {
+		    if (intersect > y && intersect <= next_y)
+		    {
 			/* Need to guarantee that we get all the way past
 			   the intersection point so that the edges sort
 			   properly next time through the loop. */
 			if (_compute_x (&e->edge, intersect) < _compute_x (&en->edge, intersect))
 			    intersect++;
-			if (intersect < next_y)
-			    next_y = intersect;
+			next_y = intersect;
 		    }
 	    }
 	}