[cairo-commit] src/cairo-composite-rectangles.c

Bryce Harrington bryce at kemper.freedesktop.org
Wed Jan 13 17:11:34 PST 2016


 src/cairo-composite-rectangles.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 047ba66519b18b7fe0167108307d741cdc816935
Author: Enrico Weigelt, metux IT consult <enrico.weigelt at gr13.net>
Date:   Tue Dec 29 10:16:48 2015 +0100

    core: dropped unnecessary local variable in _cairo_composite_rectangles_intersect()
    
    Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt at gr13.net>
    Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

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)) {


More information about the cairo-commit mailing list