fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-25 01:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[tee] Rename 'append' to 'add' and add symmetric 'remove'

Browse source
This commit is contained in:
Chris Wilson 2009-09-01 14:24:06 +01:00
parent af82670dd3
commit 1bcc3a3fa0
4 changed files with 54 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/cairo-tee-surface.c
View file

@ -51,7 +51,7 @@ typedef struct _cairo_tee_surface {
} cairo_tee_surface_t;
slim_hidden_proto (cairo_tee_surface_create);
slim_hidden_proto (cairo_tee_surface_append);
slim_hidden_proto (cairo_tee_surface_add);
static cairo_surface_t *
_cairo_tee_surface_create_similar (void *abstract_surface,
@ -80,7 +80,7 @@ _cairo_tee_surface_create_similar (void *abstract_surface,
similar = _cairo_surface_wrapper_create_similar (&slaves[n],
content,
width, height);
cairo_tee_surface_append (surface, similar);
cairo_tee_surface_add (surface, similar);
cairo_surface_destroy (similar);
}
@ -457,8 +457,8 @@ cairo_tee_surface_create (cairo_surface_t *master)
slim_hidden_def (cairo_tee_surface_create);
void
cairo_tee_surface_append (cairo_surface_t *abstract_surface,
cairo_surface_t *target)
cairo_tee_surface_add (cairo_surface_t *abstract_surface,
cairo_surface_t *target)
{
cairo_tee_surface_t *surface;
cairo_surface_wrapper_t slave;
@ -487,7 +487,48 @@ cairo_tee_surface_append (cairo_surface_t *abstract_surface,
status = _cairo_surface_set_error (&surface->base, status);
}
}
slim_hidden_def (cairo_tee_surface_append);
slim_hidden_def (cairo_tee_surface_add);
void
cairo_tee_surface_remove (cairo_surface_t *abstract_surface,
cairo_surface_t *target)
{
cairo_tee_surface_t *surface;
cairo_surface_wrapper_t *slaves;
int n, num_slaves;
cairo_status_t status;
if (abstract_surface->backend != &cairo_tee_surface_backend) {
status = _cairo_surface_set_error (abstract_surface,
_cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
return;
}
surface = (cairo_tee_surface_t *) abstract_surface;
if (target == surface->master.target) {
status = _cairo_surface_set_error (abstract_surface,
_cairo_error (CAIRO_STATUS_INVALID_INDEX));
return;
}
num_slaves = _cairo_array_num_elements (&surface->slaves);
slaves = _cairo_array_index (&surface->slaves, 0);
for (n = 0; n < num_slaves; n++) {
if (slaves[n].target == target)
break;
}
if (n == num_slaves) {
status = _cairo_surface_set_error (abstract_surface,
_cairo_error (CAIRO_STATUS_INVALID_INDEX));
return;
}
_cairo_surface_wrapper_fini (&slaves[n]);
for (n++; n < num_slaves; n++)
slaves[n-1] = slaves[n];
surface->slaves.num_elements--; /* XXX: cairo_array_remove()? */
}
cairo_surface_t *
cairo_tee_surface_index (cairo_surface_t *abstract_surface,

8
src/cairo.h
View file

@ -2199,11 +2199,15 @@ cairo_public cairo_surface_t *
cairo_tee_surface_create (cairo_surface_t *master);
cairo_public void
cairo_tee_surface_append (cairo_surface_t *surface,
cairo_tee_surface_add (cairo_surface_t *surface,
cairo_surface_t *target);
cairo_public void
cairo_tee_surface_remove (cairo_surface_t *surface,
cairo_surface_t *target);
cairo_public cairo_surface_t *
cairo_tee_surface_index (cairo_surface_t *abstract_surface,
cairo_tee_surface_index (cairo_surface_t *surface,
int index);
/* Pattern creation functions */

2
util/cairo-fdr/fdr.c
View file

@ -164,7 +164,7 @@ cairo_create (cairo_surface_t *surface)
tee = DLCALL (cairo_tee_surface_create, surface);
record = DLCALL (cairo_meta_surface_create, content, &extents);
DLCALL (cairo_tee_surface_append, tee, record);
DLCALL (cairo_tee_surface_add, tee, record);
DLCALL (cairo_surface_set_user_data, surface,
&fdr_key, tee, fdr_surface_destroy);

2
util/cairo-sphinx/fdr.c
View file

@ -136,7 +136,7 @@ cairo_create (cairo_surface_t *surface)
tee = DLCALL (cairo_tee_surface_create, surface);
script = DLCALL (cairo_script_surface_create,
fdr_context, content, extents.width, extents.height);
DLCALL (cairo_tee_surface_append, tee, script);
DLCALL (cairo_tee_surface_add, tee, script);
DLCALL (cairo_surface_set_user_data, surface,
&fdr_key, tee, fdr_surface_destroy);