From 778ced4879b09f7482bd41c398bf2d984754ed0b Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 14 Jan 2009 18:55:32 +0000 Subject: [PATCH] [path] Rename _cairo_path_fixed_approximate_extents() Rename approximate_extents() to approximate_clip_extents() so that it is consistent with the fill and stroke variants and clearer under what circumstances you may wish to use it. --- src/cairo-analysis-surface.c | 2 +- src/cairo-clip.c | 4 ++-- src/cairo-path-bounds.c | 4 ++-- src/cairo-surface-fallback.c | 2 +- src/cairoint.h | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c index b80ad628c..1be592e9e 100644 --- a/src/cairo-analysis-surface.c +++ b/src/cairo-analysis-surface.c @@ -293,7 +293,7 @@ _cairo_analysis_surface_intersect_clip_path (void *abstract_surface, cairo_rectangle_int_t extents; cairo_bool_t is_empty; - _cairo_path_fixed_approximate_extents (path, &extents); + _cairo_path_fixed_approximate_clip_extents (path, &extents); is_empty = _cairo_rectangle_intersect (&surface->current_clip, &extents); } diff --git a/src/cairo-clip.c b/src/cairo-clip.c index f0f68a3e6..a64d524f3 100644 --- a/src/cairo-clip.c +++ b/src/cairo-clip.c @@ -145,7 +145,7 @@ _cairo_clip_path_intersect_to_rectangle (cairo_clip_path_t *clip_path, while (clip_path) { cairo_rectangle_int_t extents; - _cairo_path_fixed_approximate_extents (&clip_path->path, &extents); + _cairo_path_fixed_approximate_clip_extents (&clip_path->path, &extents); if (! _cairo_rectangle_intersect (rectangle, &extents)) return CAIRO_STATUS_SUCCESS; @@ -577,7 +577,7 @@ _cairo_clip_intersect_mask_using_spans (cairo_clip_t *clip, { cairo_rectangle_int_t extents; - _cairo_path_fixed_approximate_extents (path, &extents); + _cairo_path_fixed_approximate_clip_extents (path, &extents); if (! _cairo_rectangle_intersect (&surface_rect, &extents)) goto SUCCESS; diff --git a/src/cairo-path-bounds.c b/src/cairo-path-bounds.c index 7047ca860..9f30eb509 100644 --- a/src/cairo-path-bounds.c +++ b/src/cairo-path-bounds.c @@ -156,8 +156,8 @@ _cairo_path_bounder_close_path (void *closure) * the control points of the curves, not the flattened path). */ void -_cairo_path_fixed_approximate_extents (cairo_path_fixed_t *path, - cairo_rectangle_int_t *extents) +_cairo_path_fixed_approximate_clip_extents (cairo_path_fixed_t *path, + cairo_rectangle_int_t *extents) { cairo_path_bounder_t bounder; cairo_status_t status; diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c index 6cc67d190..96ed2f9e7 100644 --- a/src/cairo-surface-fallback.c +++ b/src/cairo-surface-fallback.c @@ -957,7 +957,7 @@ _cairo_surface_fallback_fill (cairo_surface_t *surface, if (_cairo_operator_bounded_by_mask (op)) { cairo_rectangle_int_t path_extents; - _cairo_path_fixed_approximate_fill_extents (path, + _cairo_path_fixed_approximate_clip_extents (path, &path_extents); if (! _cairo_rectangle_intersect (&extents, &path_extents)) return CAIRO_STATUS_SUCCESS; diff --git a/src/cairoint.h b/src/cairoint.h index a67dff5bd..6b38fd46c 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -1540,8 +1540,8 @@ _cairo_path_fixed_append (cairo_path_fixed_t *path, cairo_direction_t dir); cairo_private void -_cairo_path_fixed_approximate_extents (cairo_path_fixed_t *path, - cairo_rectangle_int_t *extents); +_cairo_path_fixed_approximate_clip_extents (cairo_path_fixed_t *path, + cairo_rectangle_int_t *extents); cairo_private void _cairo_path_fixed_approximate_fill_extents (cairo_path_fixed_t *path,