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().
This commit is contained in:
Andrea Canciani 2011-01-22 11:56:37 +01:00
parent 47d14586f5
commit b51520628d

View file

@ -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);
}