diff options
| author | Carl Worth <cworth@cworth.org> | 2007-04-10 13:28:48 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2007-04-10 13:28:48 -0700 |
| commit | ab5eccbbf6cc361e864e0d75c0299cf7b5d6122d (patch) | |
| tree | 84542550c1036df15b8f2a9475dfaed1132282a8 | |
| parent | 7a0ae5b7057798106b5e1a82431178f6c5f148e7 (diff) | |
Make _cairo_clip_reset void
Yet another unconditionally successful function---so it's easier to return nothing.
| -rw-r--r-- | src/cairo-clip-private.h | 2 | ||||
| -rw-r--r-- | src/cairo-clip.c | 4 | ||||
| -rw-r--r-- | src/cairo-gstate.c | 4 | ||||
| -rw-r--r-- | src/cairo-meta-surface.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/cairo-clip-private.h b/src/cairo-clip-private.h index 6b557a4f..e7190cf1 100644 --- a/src/cairo-clip-private.h +++ b/src/cairo-clip-private.h @@ -92,7 +92,7 @@ _cairo_clip_init_deep_copy (cairo_clip_t *clip, cairo_clip_t *other, cairo_surface_t *target); -cairo_private cairo_status_t +cairo_private void _cairo_clip_reset (cairo_clip_t *clip); cairo_private cairo_status_t diff --git a/src/cairo-clip.c b/src/cairo-clip.c index a9f1c32d..6e52ab28 100644 --- a/src/cairo-clip.c +++ b/src/cairo-clip.c @@ -96,7 +96,7 @@ _cairo_clip_init_copy (cairo_clip_t *clip, cairo_clip_t *other) return CAIRO_STATUS_SUCCESS; } -cairo_status_t +void _cairo_clip_reset (cairo_clip_t *clip) { /* destroy any existing clip-region artifacts */ @@ -117,8 +117,6 @@ _cairo_clip_reset (cairo_clip_t *clip) _cairo_clip_path_destroy (clip->path); clip->path = NULL; - - return CAIRO_STATUS_SUCCESS; } static cairo_status_t diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c index aa4cd801..c07ce309 100644 --- a/src/cairo-gstate.c +++ b/src/cairo-gstate.c @@ -1191,7 +1191,9 @@ _cairo_gstate_fill_extents (cairo_gstate_t *gstate, cairo_status_t _cairo_gstate_reset_clip (cairo_gstate_t *gstate) { - return _cairo_clip_reset (&gstate->clip); + _cairo_clip_reset (&gstate->clip); + + return CAIRO_STATUS_SUCCESS; } cairo_status_t diff --git a/src/cairo-meta-surface.c b/src/cairo-meta-surface.c index 8ef9ec07..56c702c8 100644 --- a/src/cairo-meta-surface.c +++ b/src/cairo-meta-surface.c @@ -756,7 +756,7 @@ _cairo_meta_surface_replay (cairo_surface_t *surface, /* XXX Meta surface clipping is broken and requires some * cairo-gstate.c rewriting. Work around it for now. */ if (dev_path == NULL) - status = _cairo_clip_reset (&clip); + _cairo_clip_reset (&clip); else status = _cairo_clip_clip (&clip, dev_path, command->intersect_clip_path.fill_rule, |