fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-04 11:00:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with git+ssh://git.cairographics.org/git/cairo

Browse source
This commit is contained in:
Anders Carlsson 2006-04-10 19:32:47 +02:00
commit 807f64d57c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cairo-base85-stream.c
View file

@ -63,9 +63,9 @@ _expand_four_tuple_to_five (unsigned char four_tuple[4],
}
static cairo_status_t
_cairo_base85_stream_write_data (void *closure,
const unsigned char *data,
unsigned int length)
_cairo_base85_stream_write (void *closure,
const unsigned char *data,
unsigned int length)
{
cairo_base85_stream_t *stream = closure;
const unsigned char *ptr = data;
@ -123,7 +123,7 @@ _cairo_base85_stream_create (cairo_output_stream_t *output)
stream->output = output;
stream->pending = 0;
return _cairo_output_stream_create (_cairo_base85_stream_write_data,
return _cairo_output_stream_create (_cairo_base85_stream_write,
_cairo_base85_stream_close,
stream);
}

12
src/cairo-output-stream.c
View file

@ -44,7 +44,7 @@
#endif /* _MSC_VER */
struct _cairo_output_stream {
cairo_write_func_t write_data;
cairo_write_func_t write_func;
cairo_close_func_t close_func;
void *closure;
unsigned long position;
@ -53,7 +53,7 @@ struct _cairo_output_stream {
};
const cairo_output_stream_t cairo_output_stream_nil = {
NULL, /* write_data */
NULL, /* write_func */
NULL, /* close_func */
NULL, /* closure */
0, /* position */
@ -62,7 +62,7 @@ const cairo_output_stream_t cairo_output_stream_nil = {
};
static const cairo_output_stream_t cairo_output_stream_nil_write_error = {
NULL, /* write_data */
NULL, /* write_func */
NULL, /* close_func */
NULL, /* closure */
0, /* position */
@ -71,7 +71,7 @@ static const cairo_output_stream_t cairo_output_stream_nil_write_error = {
};
cairo_output_stream_t *
_cairo_output_stream_create (cairo_write_func_t write_data,
_cairo_output_stream_create (cairo_write_func_t write_func,
cairo_close_func_t close_func,
void *closure)
{
@ -81,7 +81,7 @@ _cairo_output_stream_create (cairo_write_func_t write_data,
if (stream == NULL)
return (cairo_output_stream_t *) &cairo_output_stream_nil;
stream->write_data = write_data;
stream->write_func = write_func;
stream->close_func = close_func;
stream->closure = closure;
stream->position = 0;
@ -125,7 +125,7 @@ _cairo_output_stream_write (cairo_output_stream_t *stream,
if (stream->status)
return;
stream->status = stream->write_data (stream->closure, data, length);
stream->status = stream->write_func (stream->closure, data, length);
stream->position += length;
}