Revert "[pdf] Tweak the mask analysis to avoid an assertion failure."

This reverts commit c9ec82f3a8, which
notably caused regresions in the mask and clip-operator tests.

Obviously I'm not smart enough to fix bugs. Since the computer found the
assertion failure, I need to train the computer to fix the bugs as well.
This commit is contained in:
Chris Wilson 2008-09-24 22:16:39 +01:00
parent ab682a6ff2
commit dfe9f7093f

View file

@ -4471,18 +4471,13 @@ _cairo_pdf_surface_mask (void *abstract_surface,
if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE) {
status = _cairo_pdf_surface_analyze_operation (surface, op, source);
if (status != CAIRO_STATUS_SUCCESS &&
status <= CAIRO_INT_STATUS_UNSUPPORTED)
status != CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN)
return status;
status2 = _cairo_pdf_surface_analyze_operation (surface, op, mask);
if (status2 == CAIRO_STATUS_SUCCESS)
return status;
if (status2 <= CAIRO_INT_STATUS_UNSUPPORTED)
if (status2 != CAIRO_STATUS_SUCCESS)
return status2;
/* XXX At this point, both status and status2 indicate that the
* patterns require further analysis. */
return status;
} else if (surface->paginated_mode == CAIRO_PAGINATED_MODE_FALLBACK) {
status = _cairo_pdf_surface_start_fallback (surface);