diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-10-18 18:42:54 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-10-18 18:42:54 +0000 |
| commit | 7a4c68938789206bfec3c6d15cc4bb922daf6443 (patch) | |
| tree | e5f031fc609e50a8b7b12e7d6abf63cc78cc88e7 /gdk-pixbuf/gdk-pixbuf-io.h | |
| parent | 7420908815651a1ff2ceb1c0fb5e92fe9b260619 (diff) | |
| download | gdk-pixbuf-7a4c68938789206bfec3c6d15cc4bb922daf6443.tar.gz | |
Some updates
2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtk-sections.txt: Some updates
* gdk/gdk-sections.txt: remove GdkPixbufAlphaMode
* gdk-pixbuf/gdk-pixbuf-sections.txt: Add new API, remove
GdkPixbufClass/GdkAnimationClass since those are private
* gdk-pixbuf/Makefile.am (IGNORE_HFILES): ignore more headers
2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
2000-10-16 Havoc Pennington <hp@redhat.com>
* gdk-pixbuf-io.c (gdk_pixbuf_get_module)
(gdk_pixbuf_get_named_module) (gdk_pixbuf_load_module):
add error reporting here also
* make-inline-pixbuf.c (main): use GError
* io-xpm.c: include unistd.h
* gdk-pixbuf-util.c: include string.h
* io-*.c: add error reporting
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file): add
error reporting
* gdk-pixbuf-io.c (gdk_pixbuf_new_from_file): Add error reporting
* gdk-pixbuf-io.h: Add GError** to load_increment and load
methods
* gdk-pixbuf-io.c (gdk_pixbuf_save) (gdk_pixbuf_savev): return
a G_FILE_ERROR if we fail to write or close the file.
* gdk-pixbuf.h: remove GDK_PIXBUF_ERROR_IO, instead we'll use
G_FILE_ERROR_*. Rename enum to GdkPixbufError, properly following
the GError naming rules. Add GError** to load functions.
Diffstat (limited to 'gdk-pixbuf/gdk-pixbuf-io.h')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h index 3ce4d2f73..60046b8e7 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.h +++ b/gdk-pixbuf/gdk-pixbuf-io.h @@ -55,7 +55,8 @@ struct _GdkPixbufModule { char *module_name; gboolean (* format_check) (guchar *buffer, int size); GModule *module; - GdkPixbuf *(* load) (FILE *f); + GdkPixbuf *(* load) (FILE *f, + GError **error); GdkPixbuf *(* load_xpm_data) (const char **data); /* Incremental loading */ @@ -64,26 +65,33 @@ struct _GdkPixbufModule { ModuleUpdatedNotifyFunc update_func, ModuleFrameDoneNotifyFunc frame_done_func, ModuleAnimationDoneNotifyFunc anim_done_func, - gpointer user_data); + gpointer user_data, + GError **error); void (* stop_load) (gpointer context); gboolean (* load_increment) (gpointer context, const guchar *buf, - guint size); + guint size, + GError **error); /* Animation loading */ - GdkPixbufAnimation *(* load_animation) (FILE *f); + GdkPixbufAnimation *(* load_animation) (FILE *f, + GError **error); gboolean (* save) (FILE *f, GdkPixbuf *pixbuf, gchar **param_keys, gchar **param_values, - GError **err); + GError **error); }; -GdkPixbufModule *gdk_pixbuf_get_module (guchar *buffer, guint size); -GdkPixbufModule *gdk_pixbuf_get_named_module (const char *name); -void gdk_pixbuf_load_module (GdkPixbufModule *image_module); +GdkPixbufModule *gdk_pixbuf_get_module (guchar *buffer, guint size, + const gchar *filename, + GError **error); +GdkPixbufModule *gdk_pixbuf_get_named_module (const char *name, + GError **error); +gboolean gdk_pixbuf_load_module (GdkPixbufModule *image_module, + GError **error); |