From e540d4c44f7d38881c40a2eff1dab6469968b380 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 9 Sep 2003 17:38:10 +0000 Subject: [PATCH] Updated calls to slim_hidden_def to track changes in slim 0.2.0 --- ChangeLog | 5 +++++ configure.in | 2 +- src/cairo-matrix.c | 16 ++++++++-------- src/cairo-surface.c | 16 ++++++++-------- src/cairo.c | 12 ++++++------ src/cairo_matrix.c | 16 ++++++++-------- src/cairo_surface.c | 16 ++++++++-------- 7 files changed, 44 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa8505952..03e8b3cd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-09-09 Carl Worth + + * configure.in (PKG_CHECK_MODULES): Updated calls to + slim_hidden_def to track changes in slim 0.2.0. + 2003-09-05 Carl Worth * configure.in (PKG_CHECK_MODULES): Require libic >= 0.1.1 diff --git a/configure.in b/configure.in index 20f4283dc..7914e5f2e 100644 --- a/configure.in +++ b/configure.in @@ -40,7 +40,7 @@ AC_PATH_XTRA dnl =========================================================================== -PKG_CHECK_MODULES(CAIRO, slim libic >= 0.1.1 xft) +PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.1 xft) AC_SUBST(CAIRO_CFLAGS) AC_SUBST(CAIRO_LIBS) diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c index 1b9147f4e..507f2a1b8 100644 --- a/src/cairo-matrix.c +++ b/src/cairo-matrix.c @@ -84,7 +84,7 @@ cairo_matrix_copy (cairo_matrix_t *matrix, const cairo_matrix_t *other) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_copy) +slim_hidden_def(cairo_matrix_copy); cairo_status_t cairo_matrix_set_identity (cairo_matrix_t *matrix) @@ -93,7 +93,7 @@ cairo_matrix_set_identity (cairo_matrix_t *matrix) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_set_identity) +slim_hidden_def(cairo_matrix_set_identity); cairo_status_t cairo_matrix_set_affine (cairo_matrix_t *matrix, @@ -107,7 +107,7 @@ cairo_matrix_set_affine (cairo_matrix_t *matrix, return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_set_affine) +slim_hidden_def(cairo_matrix_set_affine); cairo_status_t cairo_matrix_get_affine (cairo_matrix_t *matrix, @@ -161,7 +161,7 @@ cairo_matrix_scale (cairo_matrix_t *matrix, double sx, double sy) return cairo_matrix_multiply (matrix, &tmp, matrix); } -slim_hidden_def(cairo_matrix_scale) +slim_hidden_def(cairo_matrix_scale); cairo_status_t _cairo_matrix_set_rotate (cairo_matrix_t *matrix, @@ -207,7 +207,7 @@ cairo_matrix_multiply (cairo_matrix_t *result, const cairo_matrix_t *a, const ca return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_multiply) +slim_hidden_def(cairo_matrix_multiply); cairo_status_t cairo_matrix_transform_distance (cairo_matrix_t *matrix, double *dx, double *dy) @@ -224,7 +224,7 @@ cairo_matrix_transform_distance (cairo_matrix_t *matrix, double *dx, double *dy) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_transform_distance) +slim_hidden_def(cairo_matrix_transform_distance); cairo_status_t cairo_matrix_transform_point (cairo_matrix_t *matrix, double *x, double *y) @@ -236,7 +236,7 @@ cairo_matrix_transform_point (cairo_matrix_t *matrix, double *x, double *y) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_transform_point) +slim_hidden_def(cairo_matrix_transform_point); cairo_status_t _cairo_matrix_transform_bounding_box (cairo_matrix_t *matrix, @@ -338,7 +338,7 @@ cairo_matrix_invert (cairo_matrix_t *matrix) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_invert) +slim_hidden_def(cairo_matrix_invert); cairo_status_t _cairo_matrix_compute_determinant (cairo_matrix_t *matrix, double *det) diff --git a/src/cairo-surface.c b/src/cairo-surface.c index d45a553b9..a2fd8dee8 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -146,7 +146,7 @@ cairo_surface_create_for_drawable (Display *dpy, return surface; } -slim_hidden_def(cairo_surface_create_for_drawable) +slim_hidden_def(cairo_surface_create_for_drawable); static int cairo_format_bpp (cairo_format_t format) @@ -216,7 +216,7 @@ cairo_surface_create_for_image (char *data, return surface; } -slim_hidden_def(cairo_surface_create_for_image) +slim_hidden_def(cairo_surface_create_for_image); cairo_surface_t * cairo_surface_create_similar (cairo_surface_t *other, @@ -299,7 +299,7 @@ cairo_surface_create_similar_solid (cairo_surface_t *other, _cairo_surface_fill_rectangle (surface, CAIRO_OPERATOR_SRC, &color, 0, 0, width, height); return surface; } -slim_hidden_def(cairo_surface_create_similar_solid) +slim_hidden_def(cairo_surface_create_similar_solid); void _cairo_surface_reference (cairo_surface_t *surface) @@ -337,7 +337,7 @@ cairo_surface_destroy (cairo_surface_t *surface) free (surface); } -slim_hidden_def(cairo_surface_destroy) +slim_hidden_def(cairo_surface_destroy); static void _cairo_surface_ensure_gc (cairo_surface_t *surface) @@ -348,7 +348,7 @@ _cairo_surface_ensure_gc (cairo_surface_t *surface) surface->gc = XCreateGC (surface->dpy, surface->drawable, 0, NULL); } -static cairo_status_t +cairo_status_t cairo_x11_surface_put_image (cairo_surface_t *surface, char *data, int width, @@ -499,7 +499,7 @@ cairo_surface_set_matrix (cairo_surface_t *surface, cairo_matrix_t *matrix) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_surface_set_matrix) +slim_hidden_def(cairo_surface_set_matrix); cairo_status_t cairo_surface_get_matrix (cairo_surface_t *surface, cairo_matrix_t *matrix) @@ -516,7 +516,7 @@ cairo_surface_get_matrix (cairo_surface_t *surface, cairo_matrix_t *matrix) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_surface_get_matrix) +slim_hidden_def(cairo_surface_get_matrix); /* XXX: The Render specification has capitalized versions of these strings. However, the current implementation is case-sensitive and @@ -591,7 +591,7 @@ cairo_surface_set_repeat (cairo_surface_t *surface, int repeat) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_surface_set_repeat) +slim_hidden_def(cairo_surface_set_repeat); void _cairo_surface_composite (cairo_operator_t operator, diff --git a/src/cairo.c b/src/cairo.c index 99c8e5c89..99a924b25 100644 --- a/src/cairo.c +++ b/src/cairo.c @@ -100,7 +100,7 @@ cairo_save (cairo_t *cr) top->next = cr->gstate; cr->gstate = top; } -slim_hidden_def(cairo_save) +slim_hidden_def(cairo_save); void cairo_restore (cairo_t *cr) @@ -120,7 +120,7 @@ cairo_restore (cairo_t *cr) _cairo_gstate_destroy (top); } -slim_hidden_def(cairo_restore) +slim_hidden_def(cairo_restore); /* XXX: I want to rethink this API void @@ -158,7 +158,7 @@ cairo_set_target_surface (cairo_t *cr, cairo_surface_t *surface) cr->status = _cairo_gstate_set_target_surface (cr->gstate, surface); } -slim_hidden_def(cairo_set_target_surface) +slim_hidden_def(cairo_set_target_surface); void cairo_set_target_drawable (cairo_t *cr, @@ -435,7 +435,7 @@ cairo_move_to (cairo_t *cr, double x, double y) cr->status = _cairo_gstate_move_to (cr->gstate, x, y); } -slim_hidden_def(cairo_move_to) +slim_hidden_def(cairo_move_to); void cairo_line_to (cairo_t *cr, double x, double y) @@ -478,7 +478,7 @@ cairo_rel_line_to (cairo_t *cr, double dx, double dy) cr->status = _cairo_gstate_rel_line_to (cr->gstate, dx, dy); } -slim_hidden_def(cairo_rel_line_to) +slim_hidden_def(cairo_rel_line_to); void cairo_rel_curve_to (cairo_t *cr, @@ -529,7 +529,7 @@ cairo_close_path (cairo_t *cr) cr->status = _cairo_gstate_close_path (cr->gstate); } -slim_hidden_def(cairo_close_path) +slim_hidden_def(cairo_close_path); void cairo_stroke (cairo_t *cr) diff --git a/src/cairo_matrix.c b/src/cairo_matrix.c index 1b9147f4e..507f2a1b8 100644 --- a/src/cairo_matrix.c +++ b/src/cairo_matrix.c @@ -84,7 +84,7 @@ cairo_matrix_copy (cairo_matrix_t *matrix, const cairo_matrix_t *other) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_copy) +slim_hidden_def(cairo_matrix_copy); cairo_status_t cairo_matrix_set_identity (cairo_matrix_t *matrix) @@ -93,7 +93,7 @@ cairo_matrix_set_identity (cairo_matrix_t *matrix) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_set_identity) +slim_hidden_def(cairo_matrix_set_identity); cairo_status_t cairo_matrix_set_affine (cairo_matrix_t *matrix, @@ -107,7 +107,7 @@ cairo_matrix_set_affine (cairo_matrix_t *matrix, return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_set_affine) +slim_hidden_def(cairo_matrix_set_affine); cairo_status_t cairo_matrix_get_affine (cairo_matrix_t *matrix, @@ -161,7 +161,7 @@ cairo_matrix_scale (cairo_matrix_t *matrix, double sx, double sy) return cairo_matrix_multiply (matrix, &tmp, matrix); } -slim_hidden_def(cairo_matrix_scale) +slim_hidden_def(cairo_matrix_scale); cairo_status_t _cairo_matrix_set_rotate (cairo_matrix_t *matrix, @@ -207,7 +207,7 @@ cairo_matrix_multiply (cairo_matrix_t *result, const cairo_matrix_t *a, const ca return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_multiply) +slim_hidden_def(cairo_matrix_multiply); cairo_status_t cairo_matrix_transform_distance (cairo_matrix_t *matrix, double *dx, double *dy) @@ -224,7 +224,7 @@ cairo_matrix_transform_distance (cairo_matrix_t *matrix, double *dx, double *dy) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_transform_distance) +slim_hidden_def(cairo_matrix_transform_distance); cairo_status_t cairo_matrix_transform_point (cairo_matrix_t *matrix, double *x, double *y) @@ -236,7 +236,7 @@ cairo_matrix_transform_point (cairo_matrix_t *matrix, double *x, double *y) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_transform_point) +slim_hidden_def(cairo_matrix_transform_point); cairo_status_t _cairo_matrix_transform_bounding_box (cairo_matrix_t *matrix, @@ -338,7 +338,7 @@ cairo_matrix_invert (cairo_matrix_t *matrix) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_matrix_invert) +slim_hidden_def(cairo_matrix_invert); cairo_status_t _cairo_matrix_compute_determinant (cairo_matrix_t *matrix, double *det) diff --git a/src/cairo_surface.c b/src/cairo_surface.c index d45a553b9..a2fd8dee8 100644 --- a/src/cairo_surface.c +++ b/src/cairo_surface.c @@ -146,7 +146,7 @@ cairo_surface_create_for_drawable (Display *dpy, return surface; } -slim_hidden_def(cairo_surface_create_for_drawable) +slim_hidden_def(cairo_surface_create_for_drawable); static int cairo_format_bpp (cairo_format_t format) @@ -216,7 +216,7 @@ cairo_surface_create_for_image (char *data, return surface; } -slim_hidden_def(cairo_surface_create_for_image) +slim_hidden_def(cairo_surface_create_for_image); cairo_surface_t * cairo_surface_create_similar (cairo_surface_t *other, @@ -299,7 +299,7 @@ cairo_surface_create_similar_solid (cairo_surface_t *other, _cairo_surface_fill_rectangle (surface, CAIRO_OPERATOR_SRC, &color, 0, 0, width, height); return surface; } -slim_hidden_def(cairo_surface_create_similar_solid) +slim_hidden_def(cairo_surface_create_similar_solid); void _cairo_surface_reference (cairo_surface_t *surface) @@ -337,7 +337,7 @@ cairo_surface_destroy (cairo_surface_t *surface) free (surface); } -slim_hidden_def(cairo_surface_destroy) +slim_hidden_def(cairo_surface_destroy); static void _cairo_surface_ensure_gc (cairo_surface_t *surface) @@ -348,7 +348,7 @@ _cairo_surface_ensure_gc (cairo_surface_t *surface) surface->gc = XCreateGC (surface->dpy, surface->drawable, 0, NULL); } -static cairo_status_t +cairo_status_t cairo_x11_surface_put_image (cairo_surface_t *surface, char *data, int width, @@ -499,7 +499,7 @@ cairo_surface_set_matrix (cairo_surface_t *surface, cairo_matrix_t *matrix) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_surface_set_matrix) +slim_hidden_def(cairo_surface_set_matrix); cairo_status_t cairo_surface_get_matrix (cairo_surface_t *surface, cairo_matrix_t *matrix) @@ -516,7 +516,7 @@ cairo_surface_get_matrix (cairo_surface_t *surface, cairo_matrix_t *matrix) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_surface_get_matrix) +slim_hidden_def(cairo_surface_get_matrix); /* XXX: The Render specification has capitalized versions of these strings. However, the current implementation is case-sensitive and @@ -591,7 +591,7 @@ cairo_surface_set_repeat (cairo_surface_t *surface, int repeat) return CAIRO_STATUS_SUCCESS; } -slim_hidden_def(cairo_surface_set_repeat) +slim_hidden_def(cairo_surface_set_repeat); void _cairo_surface_composite (cairo_operator_t operator,