From 30a02c8e172a9caece7526fbe87b060fc74e5041 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 21 Feb 2005 08:22:47 +0000 Subject: [PATCH] Revert accidental commit. --- ChangeLog | 5 +++++ src/cairo-pattern.c | 6 ++---- src/cairo.h | 10 +--------- src/cairo_pattern.c | 6 ++---- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8372aac22..9ab2b96f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-21 Carl Worth + + * src/cairo_pattern.c (cairo_pattern_reference): + * src/cairo.h: Revert accidental commit. + 2005-02-21 Carl Worth * src/cairo_surface.c (_fallback_composite_trapezoids): Fix y diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c index b4927afcf..b2a1ab81b 100644 --- a/src/cairo-pattern.c +++ b/src/cairo-pattern.c @@ -172,15 +172,13 @@ cairo_pattern_create_radial (double cx0, double cy0, double radius0, return pattern; } -cairo_pattern_t * +void cairo_pattern_reference (cairo_pattern_t *pattern) { if (pattern == NULL) - return NULL; + return; pattern->ref_count++; - - return pattern; } void diff --git a/src/cairo.h b/src/cairo.h index 3e5705555..d805b91df 100644 --- a/src/cairo.h +++ b/src/cairo.h @@ -774,14 +774,6 @@ cairo_image_surface_create_for_data (char *data, int height, int stride); -void -cairo_image_surface_get_data (cairo_surface_t *surface, - char **data, - cairo_format_t *format, - int *width, - int *height, - int *stride); - /* Pattern creation functions */ cairo_pattern_t * cairo_pattern_create_for_surface (cairo_surface_t *surface); @@ -794,7 +786,7 @@ cairo_pattern_t * cairo_pattern_create_radial (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1); -cairo_pattern_t * +void cairo_pattern_reference (cairo_pattern_t *pattern); void diff --git a/src/cairo_pattern.c b/src/cairo_pattern.c index b4927afcf..b2a1ab81b 100644 --- a/src/cairo_pattern.c +++ b/src/cairo_pattern.c @@ -172,15 +172,13 @@ cairo_pattern_create_radial (double cx0, double cy0, double radius0, return pattern; } -cairo_pattern_t * +void cairo_pattern_reference (cairo_pattern_t *pattern) { if (pattern == NULL) - return NULL; + return; pattern->ref_count++; - - return pattern; } void