summaryrefslogtreecommitdiff
path: root/src/cairo-composite-rectangles.c
diff options
context:
space:
mode:
authorAndrea Canciani <ranma42@gmail.com>2010-05-13 01:54:39 +0200
committerAndrea Canciani <ranma42@gmail.com>2010-05-13 01:57:24 +0200
commitee871940ffe229ed285e618566e45c7d28c5857c (patch)
treef5d50db8ad45a9d3b8abc0e4e3dfe1dede08c9f0 /src/cairo-composite-rectangles.c
parent0870c6fb5b39dcc04fa376123848adde2d06d2ce (diff)
downloadcairo-ee871940ffe229ed285e618566e45c7d28c5857c.tar.gz
Revert bd672d080ca0036ef1b88d26583e6af36f541461
on src/cairo-composite-rectangles.c The extent of the operation can be larger than the source if the operator is not bounded by the source. Fixes clip-unbounded, operator-source, surface-pattern-operator
Diffstat (limited to 'src/cairo-composite-rectangles.c')
-rw-r--r--src/cairo-composite-rectangles.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c
index ccd8884ea..0aebee36e 100644
--- a/src/cairo-composite-rectangles.c
+++ b/src/cairo-composite-rectangles.c
@@ -66,10 +66,9 @@ _cairo_composite_rectangles_init (cairo_composite_rectangles_t *extents,
extents->is_bounded = _cairo_operator_bounded_by_either (op);
_cairo_pattern_get_extents (source, &extents->source);
- if (! _cairo_rectangle_intersect (&extents->bounded, &extents->source) &&
- extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_SOURCE)
- {
- return FALSE;
+ if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_SOURCE) {
+ if (! _cairo_rectangle_intersect (&extents->bounded, &extents->source))
+ return FALSE;
}
return TRUE;