summaryrefslogtreecommitdiff
path: root/gdk-pixbuf/gdk-pixbuf.h
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2001-06-26 20:56:32 +0000
committerTim Janik <timj@src.gnome.org>2001-06-26 20:56:32 +0000
commitd4f0062f5e9c8a3fe8e4c7ba0daff28b5e76f69a (patch)
treecbec6c1be2f06e4fbe13852147b9554e02d70f83 /gdk-pixbuf/gdk-pixbuf.h
parent3704749e94a270a7101dce94d498c3649ceb6c3c (diff)
downloadgtk+-d4f0062f5e9c8a3fe8e4c7ba0daff28b5e76f69a.tar.gz
use gdk_pixbuf_new_from_stream(). fixed up item factory so inlined pixbufs
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org> * gtk/gtkiconfactory.c: * gtk/gtkitemfactory.c: use gdk_pixbuf_new_from_stream(). fixed up item factory so inlined pixbufs actually work. Tue Jun 26 09:48:02 2001 Tim Janik <timj@gtk.org> * Makefile.am (noinst_PROGRAMS): get rid of make-inline-pixbuf * gdk-pixbuf-data.[hc]: provide gdk_pixbuf_new_from_stream() instead from gdk_pixbuf_new_from_inline(). * gdk-pixdata.[hc]: auxillary GdkPixdata structure, public installed API for applications that need to serialize/deserialize on their own (gimp, BEAST). * gdk-pixbuf/gdk-pixbuf-csource.c: provide publically installed program that can dump images in CSource format and Pixbuf stream format. supports RLE encoding, MACRO formatting etc... invoke with --help.
Diffstat (limited to 'gdk-pixbuf/gdk-pixbuf.h')
-rw-r--r--gdk-pixbuf/gdk-pixbuf.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index 32ab3a8f46..2a32c2fa2b 100644
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -75,6 +75,12 @@ 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 */
@@ -142,13 +148,11 @@ GdkPixbuf *gdk_pixbuf_new_from_data (const guchar *data,
gpointer destroy_fn_data);
GdkPixbuf *gdk_pixbuf_new_from_xpm_data (const char **data);
-
-/* Read an inline pixbuf */
-GdkPixbuf *gdk_pixbuf_new_from_inline (const guchar *inline_pixbuf,
- gboolean copy_pixels,
- int length,
- GError **error);
-
+GdkPixbuf* gdk_pixbuf_new_from_stream (gint stream_length,
+ const guint8 *stream,
+ gboolean copy_pixels,
+ GError **error);
+
/* Mutations */
void gdk_pixbuf_fill (GdkPixbuf *pixbuf,
guint32 pixel);