summaryrefslogtreecommitdiff
path: root/gdk-pixbuf/gdk-pixbuf.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@src.gnome.org>2001-06-26 16:19:01 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-06-26 16:19:01 +0000
commit837b7120a81a4a64ece4dc361efba656641d091f (patch)
treed6b210fd337e6643259f848918c8f0b46126b880 /gdk-pixbuf/gdk-pixbuf.h
parent671b3b0eb06ede434e5e64ff77e7444634cb59a1 (diff)
downloadgdk-pixbuf-837b7120a81a4a64ece4dc361efba656641d091f.tar.gz
Revert inline-pixbuf changes until Tim comes back to fix missing files
Diffstat (limited to 'gdk-pixbuf/gdk-pixbuf.h')
-rw-r--r--gdk-pixbuf/gdk-pixbuf.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index 2a32c2fa2..32ab3a8f4 100644
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -75,12 +75,6 @@ typedef void (* GdkPixbufDestroyNotify) (guchar *pixels, gpointer data);
#define GDK_PIXBUF_ERROR gdk_pixbuf_error_quark ()
typedef enum {
- /* stream header corrupt */
- GDK_PIXBUF_ERROR_HEADER_CORRUPT,
- /* stream pixel data corrupt */
- GDK_PIXBUF_ERROR_PIXEL_CORRUPT,
- /* stream header corrupt */
- GDK_PIXBUF_ERROR_UNKNOWN_FORMAT,
/* image data hosed */
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
/* no mem to load image */
@@ -148,11 +142,13 @@ GdkPixbuf *gdk_pixbuf_new_from_data (const guchar *data,
gpointer destroy_fn_data);
GdkPixbuf *gdk_pixbuf_new_from_xpm_data (const char **data);
-GdkPixbuf* gdk_pixbuf_new_from_stream (gint stream_length,
- const guint8 *stream,
- gboolean copy_pixels,
- GError **error);
-
+
+/* Read an inline pixbuf */
+GdkPixbuf *gdk_pixbuf_new_from_inline (const guchar *inline_pixbuf,
+ gboolean copy_pixels,
+ int length,
+ GError **error);
+
/* Mutations */
void gdk_pixbuf_fill (GdkPixbuf *pixbuf,
guint32 pixel);