diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2007-02-21 18:03:52 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2007-02-23 17:26:42 -0500 |
| commit | 4e30919f30e7618dbb62d7de2931efaac26c1785 (patch) | |
| tree | 7bfe2c69b09e4e132d79fa0a4797a2c02c08ea54 /src | |
| parent | a57bc6b6973a270ef85d73089ebd9d10b3bc5aa8 (diff) | |
[cairo-surface] Do not err on CAIRO_EXTEND_PAD and CAIRO_EXTEND_REFLECT
for surface patterns.
Right before releasing cairo 1.2, Carl and I decided to return error on
CAIRO_EXTEND_PAD and CAIRO_EXTEND_REFLECT for surface patterns, as they
are not implemented and one was causing crashes. Well, that was probably
the worst decision we could make (other than ignoring the problem). A
much better decision would have been to make them act like
CAIRO_EXTEND_NONE and CAIRO_EXTEND_REPEAT respectively. Anyway, remove
the error paths.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cairo-surface.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/cairo-surface.c b/src/cairo-surface.c index 12240811..5ea278f2 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -1267,12 +1267,6 @@ _cairo_surface_paint (cairo_surface_t *surface, assert (! surface->is_snapshot); - if (source->type == CAIRO_PATTERN_TYPE_SURFACE && - (source->extend == CAIRO_EXTEND_REFLECT || source->extend == CAIRO_EXTEND_PAD)) - { - return CAIRO_STATUS_NO_MEMORY; - } - _cairo_surface_copy_pattern_for_destination (source, surface, &dev_source.base); if (surface->backend->paint) { @@ -1301,12 +1295,6 @@ _cairo_surface_mask (cairo_surface_t *surface, assert (! surface->is_snapshot); - if (source->type == CAIRO_PATTERN_TYPE_SURFACE && - (source->extend == CAIRO_EXTEND_REFLECT || source->extend == CAIRO_EXTEND_PAD)) - { - return CAIRO_STATUS_NO_MEMORY; - } - _cairo_surface_copy_pattern_for_destination (source, surface, &dev_source.base); _cairo_surface_copy_pattern_for_destination (mask, surface, &dev_mask.base); @@ -1345,12 +1333,6 @@ _cairo_surface_stroke (cairo_surface_t *surface, assert (! surface->is_snapshot); - if (source->type == CAIRO_PATTERN_TYPE_SURFACE && - (source->extend == CAIRO_EXTEND_REFLECT || source->extend == CAIRO_EXTEND_PAD)) - { - return CAIRO_STATUS_NO_MEMORY; - } - _cairo_surface_copy_pattern_for_destination (source, surface, &dev_source.base); if (surface->backend->stroke) { @@ -1390,12 +1372,6 @@ _cairo_surface_fill (cairo_surface_t *surface, assert (! surface->is_snapshot); - if (source->type == CAIRO_PATTERN_TYPE_SURFACE && - (source->extend == CAIRO_EXTEND_REFLECT || source->extend == CAIRO_EXTEND_PAD)) - { - return CAIRO_STATUS_NO_MEMORY; - } - _cairo_surface_copy_pattern_for_destination (source, surface, &dev_source.base); if (surface->backend->fill) { @@ -1797,12 +1773,6 @@ _cairo_surface_show_glyphs (cairo_surface_t *surface, assert (! surface->is_snapshot); - if (source->type == CAIRO_PATTERN_TYPE_SURFACE && - (source->extend == CAIRO_EXTEND_REFLECT || source->extend == CAIRO_EXTEND_PAD)) - { - return CAIRO_STATUS_NO_MEMORY; - } - if (!num_glyphs) return CAIRO_STATUS_SUCCESS; |