[cairo-commit] cairo/src cairo-gstate.c, 1.130, 1.131 cairo-traps.c, 1.27, 1.28

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv10487/src

Modified Files:
	cairo-gstate.c cairo-traps.c 
Log Message:

        * src/cairo-gstate.c (_cairo_gstate_get_clip_extents): Fix bug in
        converting box to rectangle that left clip_rect.height
        uninitialized, (leading to unpredictable, intermittent test
        failures).


Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- cairo-gstate.c	26 May 2005 18:35:46 -0000	1.130
+++ cairo-gstate.c	1 Jun 2005 07:29:24 -0000	1.131
@@ -378,7 +378,7 @@
 	clip_rect.x = clip_box->x1;
 	clip_rect.width = clip_box->x2 - clip_box->x1;
 	clip_rect.y = clip_box->y1;
-	clip_rect.width = clip_box->y2 + clip_box->y1;
+	clip_rect.height = clip_box->y2 - clip_box->y1;
 	/* intersect with surface extents */
 	_cairo_rectangle_intersect (rectangle, &clip_rect);
     }

Index: cairo-traps.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-traps.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cairo-traps.c	27 Apr 2005 17:16:47 -0000	1.27
+++ cairo-traps.c	1 Jun 2005 07:29:24 -0000	1.28
@@ -820,7 +820,7 @@
 	int width = _cairo_fixed_integer_part(traps->traps[i].right.p1.x) - x;
 	int height = _cairo_fixed_integer_part(traps->traps[i].left.p2.y) - y;
 
-	/* Sometimes we get degenerate trapezoids from the tesellator,
+	/* XXX: Sometimes we get degenerate trapezoids from the tesellator,
 	 * if we call pixman_region_union_rect(), it bizarrly fails on such
 	 * an empty rectangle, so skip them.
 	 */