diff options
author | Andrea Canciani <ranma42@gmail.com> | 2011-01-22 11:56:37 +0100 |
---|---|---|
committer | Andrea Canciani <ranma42@gmail.com> | 2011-01-22 11:56:37 +0100 |
commit | b51520628de73d5f560720c20987e5be5440edb0 (patch) | |
tree | 4e2e451d61f31c9a8fddc45134105e2e6558d24e | |
parent | 47d14586f5d56b2c926a2ddbca6cfbd284c3b3f1 (diff) |
clip: Improve _cairo_clip_contains_*
_cairo_clip_contains_rectangle() considered a NULL clip empty instead
of containing everything.
_cairo_clip_contains_rectangle() checks for NULL clips, so we don't
have to check for them in _cairo_clip_contains_extents().
-rw-r--r-- | src/cairo-clip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cairo-clip.c b/src/cairo-clip.c index f890c071..696c5b1a 100644 --- a/src/cairo-clip.c +++ b/src/cairo-clip.c @@ -1109,8 +1109,9 @@ _cairo_clip_contains_rectangle (cairo_clip_t *clip, { cairo_clip_path_t *clip_path; + /* clip == NULL means no clip, so the clip contains everything */ if (clip == NULL) - return FALSE; + return TRUE; clip_path = clip->path; if (clip_path->extents.x > rect->x || @@ -1148,9 +1149,6 @@ _cairo_clip_contains_extents (cairo_clip_t *clip, { const cairo_rectangle_int_t *rect; - if (clip == NULL) - return FALSE; - rect = extents->is_bounded ? &extents->bounded : &extents->unbounded; return _cairo_clip_contains_rectangle (clip, rect); } |