[analysis] Only limit to mask extends if bounded by mask.

The extents of cairo_mask() is only limited to the mask if the operation is bounded by the mask.
git-mirror · Oct 30, 2008 · 540f555 · 540f555
1 parent 4b29988
commit 540f555
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 2 deletions.
diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c
@@ -416,12 +416,16 @@ _cairo_analysis_surface_mask (void		*abstract_surface,
 	    return status;
 
 	is_empty = _cairo_rectangle_intersect (&extents, &source_extents);
+    }
+
+    if (_cairo_operator_bounded_by_mask (op)) {
+	cairo_rectangle_int_t mask_extents;
 
-	status = _cairo_pattern_get_extents (mask, &source_extents);
+	status = _cairo_pattern_get_extents (mask, &mask_extents);
 	if (status)
 	    return status;
 
-	is_empty = _cairo_rectangle_intersect (&extents, &source_extents);
+	is_empty = _cairo_rectangle_intersect (&extents, &mask_extents);
     }
 
     is_empty = _cairo_rectangle_intersect (&extents, &surface->current_clip);

diff --git a/test/clip-operator-pdf-argb32-ref.png b/test/clip-operator-pdf-argb32-ref.png
diff --git a/test/clip-operator-pdf-rgb24-ref.png b/test/clip-operator-pdf-rgb24-ref.png
diff --git a/test/operator-clear-pdf-argb32-ref.png b/test/operator-clear-pdf-argb32-ref.png
diff --git a/test/operator-clear-pdf-rgb24-ref.png b/test/operator-clear-pdf-rgb24-ref.png
diff --git a/test/operator-source-pdf-argb32-ref.png b/test/operator-source-pdf-argb32-ref.png
diff --git a/test/operator-source-pdf-rgb24-ref.png b/test/operator-source-pdf-rgb24-ref.png