diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2010-04-19 09:53:00 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2010-06-10 16:07:41 +0200 |
| commit | baaf312e047a9bea6f54e63cd6534c2ed7448523 (patch) | |
| tree | 500783e432daf33695095f456de7a06b46f6e0c5 /src/cairo-gstate.c | |
| parent | 7461947eb1a5f002a5931303843a5a2deca0e383 (diff) | |
| download | cairo-baaf312e047a9bea6f54e63cd6534c2ed7448523.tar.gz | |
pattern: remove content field from solid patterns
The content field in solid patterns had ill-defined semantic (or no
semantic at all), thus it can be removed.
Diffstat (limited to 'src/cairo-gstate.c')
| -rw-r--r-- | src/cairo-gstate.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c index f7a32aec3..4738449b1 100644 --- a/src/cairo-gstate.c +++ b/src/cairo-gstate.c @@ -415,8 +415,7 @@ _cairo_gstate_get_source (cairo_gstate_t *gstate) { if (gstate->source == &_cairo_pattern_black.base) { /* do not expose the static object to the user */ - gstate->source = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK, - CAIRO_CONTENT_COLOR); + gstate->source = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK); } return gstate->source; @@ -861,7 +860,7 @@ _init_solid_for_color_stop (cairo_solid_pattern_t *solid, color->green, color->blue, color->alpha); - _cairo_pattern_init_solid (solid, &premult, CAIRO_CONTENT_COLOR_ALPHA); + _cairo_pattern_init_solid (solid, &premult); } static void @@ -884,8 +883,7 @@ _cairo_gstate_copy_pattern (cairo_pattern_t *pattern, if (_cairo_surface_get_extents (surface->surface, &extents) && (extents.width == 0 || extents.height == 0)) { _cairo_pattern_init_solid ((cairo_solid_pattern_t *) pattern, - CAIRO_COLOR_TRANSPARENT, - surface->surface->content); + CAIRO_COLOR_TRANSPARENT); return; } @@ -904,8 +902,7 @@ _cairo_gstate_copy_pattern (cairo_pattern_t *pattern, &src->stops->color); } else { _cairo_pattern_init_solid ((cairo_solid_pattern_t *) pattern, - CAIRO_COLOR_TRANSPARENT, - CAIRO_CONTENT_ALPHA); + CAIRO_COLOR_TRANSPARENT); } return; @@ -1147,8 +1144,7 @@ _cairo_gstate_mask (cairo_gstate_t *gstate, _cairo_color_multiply_alpha (&combined, mask_pattern.solid.color.alpha); } - _cairo_pattern_init_solid (&source_pattern.solid, &combined, - solid->content | mask_pattern.solid.content); + _cairo_pattern_init_solid (&source_pattern.solid, &combined); status = _cairo_surface_paint (gstate->target, op, &source_pattern.base, |