diff --git a/src/cairo-clip-private.h b/src/cairo-clip-private.h index a2e8d9bc6..fbcb35216 100644 --- a/src/cairo-clip-private.h +++ b/src/cairo-clip-private.h @@ -84,9 +84,6 @@ struct _cairo_clip { cairo_private void _cairo_clip_init (cairo_clip_t *clip, cairo_surface_t *target); -cairo_private void -_cairo_clip_fini (cairo_clip_t *clip); - cairo_private void _cairo_clip_init_copy (cairo_clip_t *clip, cairo_clip_t *other); diff --git a/src/cairo-clip.c b/src/cairo-clip.c index 1698ddb66..770be12c7 100644 --- a/src/cairo-clip.c +++ b/src/cairo-clip.c @@ -67,23 +67,6 @@ _cairo_clip_init (cairo_clip_t *clip, cairo_surface_t *target) clip->path = NULL; } -void -_cairo_clip_fini (cairo_clip_t *clip) -{ - cairo_surface_destroy (clip->surface); - clip->surface = NULL; - - clip->serial = 0; - - if (clip->has_region) { - pixman_region_uninit (&clip->region); - clip->has_region = FALSE; - } - - _cairo_clip_path_destroy (clip->path); - clip->path = NULL; -} - void _cairo_clip_init_copy (cairo_clip_t *clip, cairo_clip_t *other) { diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c index 0d11f9827..41da4f408 100644 --- a/src/cairo-gstate.c +++ b/src/cairo-gstate.c @@ -158,7 +158,7 @@ _cairo_gstate_fini (cairo_gstate_t *gstate) cairo_scaled_font_destroy (gstate->scaled_font); gstate->scaled_font = NULL; - _cairo_clip_fini (&gstate->clip); + _cairo_clip_reset (&gstate->clip); cairo_surface_destroy (gstate->target); gstate->target = NULL; @@ -316,7 +316,7 @@ _cairo_gstate_redirect_target (cairo_gstate_t *gstate, cairo_surface_t *child) * since its ref is now owned by gstate->parent_target */ gstate->target = cairo_surface_reference (child); - _cairo_clip_fini (&gstate->clip); + _cairo_clip_reset (&gstate->clip); _cairo_clip_init_deep_copy (&gstate->clip, &gstate->next->clip, child); /* The clip is in surface backend coordinates for the previous target; diff --git a/src/cairo-meta-surface.c b/src/cairo-meta-surface.c index e196df29c..457bfe21a 100644 --- a/src/cairo-meta-surface.c +++ b/src/cairo-meta-surface.c @@ -773,7 +773,7 @@ _cairo_meta_surface_replay (cairo_surface_t *surface, break; } - _cairo_clip_fini (&clip); + _cairo_clip_reset (&clip); return status; }