mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-05-05 01:48:07 +02:00
Merge branch 'master' of git+ssh://git.cairographics.org/git/cairo
This commit is contained in:
commit
f5566c9b20
2 changed files with 7 additions and 6 deletions
|
|
@ -598,7 +598,7 @@ _cairo_beos_composite (cairo_operator_t op,
|
|||
return CAIRO_INT_STATUS_UNSUPPORTED;
|
||||
|
||||
// XXX should eventually support the others
|
||||
if (src->type != CAIRO_PATTERN_SURFACE ||
|
||||
if (src->type != CAIRO_PATTERN_TYPE_SURFACE ||
|
||||
src->extend != CAIRO_EXTEND_NONE)
|
||||
{
|
||||
return CAIRO_INT_STATUS_UNSUPPORTED;
|
||||
|
|
@ -777,6 +777,7 @@ _cairo_beos_surface_get_extents (void *abstract_surface,
|
|||
}
|
||||
|
||||
static const struct _cairo_surface_backend cairo_beos_surface_backend = {
|
||||
CAIRO_SURFACE_TYPE_BEOS,
|
||||
NULL, /* create_similar */
|
||||
_cairo_beos_surface_finish,
|
||||
_cairo_beos_surface_acquire_source_image,
|
||||
|
|
|
|||
|
|
@ -762,19 +762,19 @@ emit_pattern (cairo_svg_surface_t *surface, cairo_pattern_t *pattern,
|
|||
xmlBufferPtr style, int is_stroke)
|
||||
{
|
||||
switch (pattern->type) {
|
||||
case CAIRO_PATTERN_SOLID:
|
||||
case CAIRO_PATTERN_TYPE_SOLID:
|
||||
emit_solid_pattern (surface, (cairo_solid_pattern_t *) pattern, style, is_stroke);
|
||||
break;
|
||||
|
||||
case CAIRO_PATTERN_SURFACE:
|
||||
case CAIRO_PATTERN_TYPE_SURFACE:
|
||||
emit_surface_pattern (surface, (cairo_surface_pattern_t *) pattern, style, is_stroke);
|
||||
break;
|
||||
|
||||
case CAIRO_PATTERN_LINEAR:
|
||||
case CAIRO_PATTERN_TYPE_LINEAR:
|
||||
emit_linear_pattern (surface, (cairo_linear_pattern_t *) pattern, style, is_stroke);
|
||||
break;
|
||||
|
||||
case CAIRO_PATTERN_RADIAL:
|
||||
case CAIRO_PATTERN_TYPE_RADIAL:
|
||||
emit_radial_pattern (surface, (cairo_radial_pattern_t *) pattern, style, is_stroke);
|
||||
break;
|
||||
}
|
||||
|
|
@ -950,7 +950,7 @@ emit_paint (xmlNodePtr node,
|
|||
xmlBufferPtr style;
|
||||
char buffer[CAIRO_SVG_DTOSTR_BUFFER_LEN];
|
||||
|
||||
if (source->type == CAIRO_PATTERN_SURFACE)
|
||||
if (source->type == CAIRO_PATTERN_TYPE_SURFACE)
|
||||
return emit_composite_pattern (node,
|
||||
(cairo_surface_pattern_t *) source,
|
||||
NULL, NULL, FALSE);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue