diff --git a/ChangeLog b/ChangeLog
index 92d0fea90..73be44398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-12  Owen Taylor  <otaylor@redhat.com>
+
+	* src/cairo_gstate.c (_cairo_gstate_clip_and_composite_trapezoids): Fix
+	x2/x1 typo.
+
 2005-02-12  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo.c (cairo_text_extents): Return all-zero extents if
diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index 224e54030..1aac1464a 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -1589,7 +1589,7 @@ _cairo_gstate_clip_and_composite_trapezoids (cairo_gstate_t *gstate,
 
 	    extents.x = intersection_extents->x1;
 	    extents.y = intersection_extents->y1;
-	    extents.width = intersection_extents->x2 - intersection_extents->x2;
+	    extents.width = intersection_extents->x2 - intersection_extents->x1;
 	    extents.height = intersection_extents->y2 - intersection_extents->y1;
 	bail3:
 	    pixman_region_destroy (intersection);
diff --git a/src/cairo_gstate.c b/src/cairo_gstate.c
index 224e54030..1aac1464a 100644
--- a/src/cairo_gstate.c
+++ b/src/cairo_gstate.c
@@ -1589,7 +1589,7 @@ _cairo_gstate_clip_and_composite_trapezoids (cairo_gstate_t *gstate,
 
 	    extents.x = intersection_extents->x1;
 	    extents.y = intersection_extents->y1;
-	    extents.width = intersection_extents->x2 - intersection_extents->x2;
+	    extents.width = intersection_extents->x2 - intersection_extents->x1;
 	    extents.height = intersection_extents->y2 - intersection_extents->y1;
 	bail3:
 	    pixman_region_destroy (intersection);