[cairo] [PATCH 10/72] core: dropped unnecessary local variable in _cairo_composite_rectangles_intersect()

Bryce Harrington bryce at osg.samsung.com
Wed Jan 13 17:11:44 PST 2016


On Tue, Dec 29, 2015 at 10:16:48AM +0100, Enrico Weigelt, metux IT consult wrote:
> Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt at gr13.net>
> Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

Pushed:
To ssh://git.cairographics.org/git/cairo
   b371b01..047ba66  master -> master


> ---
>  src/cairo-composite-rectangles.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c
> index 495d200..bc6e1f3 100644
> --- a/src/cairo-composite-rectangles.c
> +++ b/src/cairo-composite-rectangles.c
> @@ -146,10 +146,8 @@ static cairo_int_status_t
>  _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents,
>  				       const cairo_clip_t *clip)
>  {
> -    cairo_bool_t ret;
> -
> -    ret = _cairo_rectangle_intersect (&extents->bounded, &extents->mask);
> -    if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK)
> +    if ((!_cairo_rectangle_intersect (&extents->bounded, &extents->mask)) &&
> +        (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK))
>  	return CAIRO_INT_STATUS_NOTHING_TO_DO;
>  
>      if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
> -- 
> 2.6.4.442.g545299f
> 
> -- 
> cairo mailing list
> cairo at cairographics.org
> http://lists.cairographics.org/mailman/listinfo/cairo


More information about the cairo mailing list