clip: Remove the redundant _cairo_clip_init_rectangle()

As _cairo_clip_init_rectangle() is equivalent and more importantly more
clearly written as:
  _cairo_clip_init(&clip);
  if (status = _cairo_clip_rectangle(&clip, &rect)) {
     _cairo_clip_fini(&fini);
     return status;
  }
perform the transformation and in the process catch a few mistakes along
error paths.

1 files changed, 5 insertions, 9 deletions

diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c
index f970e7d05..ae594dca0 100644
--- a/src/cairo-surface-wrapper.c
+++ b/src/cairo-surface-wrapper.c
@@ -113,11 +113,9 @@ _cairo_surface_wrapper_paint (cairo_surface_wrapper_t *wrapper,
 							&wrapper->target->device_transform);
 	    if (unlikely (status))
 		goto FINISH;
-	} else {
-	    _cairo_clip_init_copy (&clip_copy, clip);
-	}
 
-	dev_clip = &clip_copy;
+	    dev_clip = &clip_copy;
+	}
 
 	_copy_transformed_pattern (&source_copy.base, source, &wrapper->target->device_transform_inverse);
 	source = &source_copy.base;
@@ -156,12 +154,9 @@ _cairo_surface_wrapper_mask (cairo_surface_wrapper_t *wrapper,
 	    if (unlikely (status))
 		goto FINISH;
 
-	} else {
-	    _cairo_clip_init_copy (&clip_copy, clip);
+	    dev_clip = &clip_copy;
 	}
 
-	dev_clip = &clip_copy;
-
 	_copy_transformed_pattern (&source_copy.base, source, &wrapper->target->device_transform_inverse);
 	source = &source_copy.base;
 
@@ -422,11 +417,12 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
 	int i;
 
 	if (clip != NULL) {
-	    dev_clip = &clip_copy;
 	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip,
 							&wrapper->target->device_transform);
 	    if (unlikely (status))
 		goto FINISH;
+
+	    dev_clip = &clip_copy;
 	}
 
 	dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t));