From 8a680eb75ce7199a78397734f53f1ffc8fe8a7bb Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sun, 2 Apr 2000 18:54:17 +0000 Subject: [PATCH] Reverted Mark's change. The refcount is private information, and the 2000-04-01 Federico Mena Quintero * gdk-pixbuf/gdk-pixbuf.c: Reverted Mark's change. The refcount is private information, and the art_pixbuf will go away soon. --- gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/gdk-pixbuf.c | 35 +---------------------------------- gdk-pixbuf/gdk-pixbuf.h | 3 --- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 4fe397916..5a5508e2b 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2000-04-01 Federico Mena Quintero + + * gdk-pixbuf/gdk-pixbuf.c: Reverted Mark's change. The refcount + is private information, and the art_pixbuf will go away soon. + 2000-03-31 Mark Crichton * gdk-pixbuf/gdk-pixbuf.c: Added gdk_pixbuf_get_refcount diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c index 65dece8ac..1c7162267 100644 --- a/gdk-pixbuf/gdk-pixbuf.c +++ b/gdk-pixbuf/gdk-pixbuf.c @@ -295,40 +295,7 @@ gdk_pixbuf_get_rowstride (GdkPixbuf *pixbuf) return pixbuf->art_pixbuf->rowstride; } -/** - * gdk_pixbuf_get_ref: - * @pixbuf: A pixbuf. - * - * Gets the refcount of a pixbuf. - * - * Return value: The refcount of the @pixbuf argument. - **/ -gint -gdk_pixbuf_get_ref (GdkPixbuf *pixbuf) -{ - g_return_val_if_fail (pixbuf != NULL, -1); - g_return_val_if_fail (pixbuf->ref_count > 0, -1); - - return (pixbuf->ref_count); -} - -/** - * gdk_pixbuf_get_artpixbuf: - * @pixbuf: A pixbuf. - * - * Queries a pointer to the ArtPixBuf data of a pixbuf. - * - * Return value: A pointer to the pixbuf's ArtPixBuf. - **/ -ArtPixBuf * -gdk_pixbuf_get_artpixbuf (GdkPixbuf *pixbuf) -{ - g_return_val_if_fail (pixbuf != NULL, NULL); - g_assert (pixbuf->art_pixbuf != NULL); - - return pixbuf->art_pixbuf; -} - + /* General initialization hooks */ const guint gdk_pixbuf_major_version=GDK_PIXBUF_MAJOR, diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h index ff64b7a19..01f2043bf 100644 --- a/gdk-pixbuf/gdk-pixbuf.h +++ b/gdk-pixbuf/gdk-pixbuf.h @@ -94,9 +94,6 @@ guchar *gdk_pixbuf_get_pixels (GdkPixbuf *pixbuf); int gdk_pixbuf_get_width (GdkPixbuf *pixbuf); int gdk_pixbuf_get_height (GdkPixbuf *pixbuf); int gdk_pixbuf_get_rowstride (GdkPixbuf *pixbuf); -gint gdk_pixbuf_get_ref (GdkPixbuf *pixbuf); -ArtPixBuf *gdk_pixbuf_get_artpixbuf (GdkPixbuf *pixbuf); - /* Reference counting */