From 64726ccfb99ba964420f3a840fd707998927e902 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 24 Oct 2008 17:06:04 +0100
Subject: [PATCH] [traps] Whitespace.

Fixup whitespace in line with CODING_STYLE and rest of file.
---
 src/cairo-region.c |  6 +++---
 src/cairo-traps.c  | 33 ++++++++++++++++++++-------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/cairo-region.c b/src/cairo-region.c
index 23a042fd7..a89c4d070 100644
--- a/src/cairo-region.c
+++ b/src/cairo-region.c
@@ -62,8 +62,8 @@ _cairo_region_init_boxes (cairo_region_t *region,
     cairo_int_status_t status = CAIRO_STATUS_SUCCESS;
     int i;
 
-    if (count > ARRAY_LENGTH(stack_pboxes)) {
-	pboxes = _cairo_malloc_ab (count, sizeof(pixman_box32_t));
+    if (count > ARRAY_LENGTH (stack_pboxes)) {
+	pboxes = _cairo_malloc_ab (count, sizeof (pixman_box32_t));
 	if (pboxes == NULL)
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
@@ -75,7 +75,7 @@ _cairo_region_init_boxes (cairo_region_t *region,
 	pboxes[i].y2 = boxes[i].p2.y;
     }
 
-    if (!pixman_region32_init_rects (&region->rgn, pboxes, count))
+    if (! pixman_region32_init_rects (&region->rgn, pboxes, count))
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     if (pboxes != stack_pboxes)
diff --git a/src/cairo-traps.c b/src/cairo-traps.c
index b76e9089c..4fa3656a1 100644
--- a/src/cairo-traps.c
+++ b/src/cairo-traps.c
@@ -615,18 +615,25 @@ _cairo_traps_extract_region (const cairo_traps_t  *traps,
     int i, box_count;
     cairo_int_status_t status;
 
-    for (i = 0; i < traps->num_traps; i++)
-	if (!(traps->traps[i].left.p1.x == traps->traps[i].left.p2.x
-	      && traps->traps[i].right.p1.x == traps->traps[i].right.p2.x
-	      && _cairo_fixed_is_integer(traps->traps[i].top)
-	      && _cairo_fixed_is_integer(traps->traps[i].bottom)
-	      && _cairo_fixed_is_integer(traps->traps[i].left.p1.x)
-	      && _cairo_fixed_is_integer(traps->traps[i].right.p1.x))) {
+    if (traps->num_traps == 0) {
+	_cairo_region_init (region);
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    for (i = 0; i < traps->num_traps; i++) {
+	if (traps->traps[i].left.p1.x != traps->traps[i].left.p2.x   ||
+	    traps->traps[i].right.p1.x != traps->traps[i].right.p2.x ||
+	    ! _cairo_fixed_is_integer (traps->traps[i].top)          ||
+	    ! _cairo_fixed_is_integer (traps->traps[i].bottom)       ||
+	    ! _cairo_fixed_is_integer (traps->traps[i].left.p1.x)    ||
+	    ! _cairo_fixed_is_integer (traps->traps[i].right.p1.x))
+	{
 	    return CAIRO_INT_STATUS_UNSUPPORTED;
 	}
+    }
 
-    if (traps->num_traps > ARRAY_LENGTH(stack_boxes)) {
-	boxes = _cairo_malloc_ab (traps->num_traps, sizeof(cairo_box_int_t));
+    if (traps->num_traps > ARRAY_LENGTH (stack_boxes)) {
+	boxes = _cairo_malloc_ab (traps->num_traps, sizeof (cairo_box_int_t));
 
 	if (boxes == NULL)
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
@@ -635,10 +642,10 @@ _cairo_traps_extract_region (const cairo_traps_t  *traps,
     box_count = 0;
 
     for (i = 0; i < traps->num_traps; i++) {
-	int x1 = _cairo_fixed_integer_part(traps->traps[i].left.p1.x);
-	int y1 = _cairo_fixed_integer_part(traps->traps[i].top);
-	int x2 = _cairo_fixed_integer_part(traps->traps[i].right.p1.x);
-	int y2 = _cairo_fixed_integer_part(traps->traps[i].bottom);
+	int x1 = _cairo_fixed_integer_part (traps->traps[i].left.p1.x);
+	int y1 = _cairo_fixed_integer_part (traps->traps[i].top);
+	int x2 = _cairo_fixed_integer_part (traps->traps[i].right.p1.x);
+	int y2 = _cairo_fixed_integer_part (traps->traps[i].bottom);
 
 	/* XXX: Sometimes we get degenerate trapezoids from the tesellator;
 	 * skip these.