diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2000-01-05 23:06:13 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2000-01-05 23:06:13 +0000 |
| commit | 8f48c4b3cd6cf0643a7a1703de0f2c886a749228 (patch) | |
| tree | d780b88df6408d21e976083b57d35f3ce32f7c34 /gdk-pixbuf/io-ico.c | |
| parent | cc76a598ba1069e68a7afce20423d5ddd4f7ecb2 (diff) | |
| download | gtk+-8f48c4b3cd6cf0643a7a1703de0f2c886a749228.tar.gz | |
Change the order of the update func to make it more compatible with the
2000-01-05 Jonathan Blandford <jrb@redhat.com>
* gdk-pixbuf/gdk-pixbuf-io.h: Change the order of the update func
to make it more compatible with the rest of GTK. Added animation
framework for progressive loading.
* gdk-pixbuf/io-bmp.c (image_begin_load): Modified to handle new
system.
* gdk-pixbuf/io-ico.c (image_begin_load): ditto
* gdk-pixbuf/io-png.c (image_begin_load): ditto
* gdk-pixbuf/io-ras.c (image_begin_load): ditto
* gdk-pixbuf/io-jpeg.c (image_begin_load): ditto
* gdk-pixbuf/io-pnm.c (image_begin_load): ditto
* gdk-pixbuf/io-tiff.c (image_begin_load): ditto
* gdk-pixbuf/io-gif.c (image_begin_load): ditto
Diffstat (limited to 'gdk-pixbuf/io-ico.c')
| -rw-r--r-- | gdk-pixbuf/io-ico.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c index 052c74a9c8..22d1769ee7 100644 --- a/gdk-pixbuf/io-ico.c +++ b/gdk-pixbuf/io-ico.c @@ -154,7 +154,10 @@ struct ico_progressive_state { gpointer image_begin_load(ModulePreparedNotifyFunc prepared_func, - ModuleUpdatedNotifyFunc updated_func, gpointer user_data); + ModuleUpdatedNotifyFunc updated_func, + ModuleFrameDoneNotifyFunc frame_done_func, + ModuleAnimationDoneNotifyFunc anim_done_func, + gpointer user_data); void image_stop_load(gpointer data); gboolean image_load_increment(gpointer data, guchar * buf, guint size); @@ -170,7 +173,7 @@ GdkPixbuf *image_load(FILE * f) GdkPixbuf *pb; - State = image_begin_load(NULL, NULL, NULL); + State = image_begin_load(NULL, NULL, NULL, NULL, NULL); membuf = g_malloc(4096); g_assert(membuf != NULL); @@ -363,7 +366,10 @@ static void DecodeHeader(guchar *Data, gint Bytes, gpointer image_begin_load(ModulePreparedNotifyFunc prepared_func, - ModuleUpdatedNotifyFunc updated_func, gpointer user_data) + ModuleUpdatedNotifyFunc updated_func, + ModuleFrameDoneNotifyFunc frame_done_func, + ModuleAnimationDoneNotifyFunc anim_done_func, + gpointer user_data) { struct ico_progressive_state *context; @@ -609,11 +615,11 @@ static void OneLine(struct ico_progressive_state *context) if (context->updated_func != NULL) { (*context->updated_func) (context->pixbuf, - context->user_data, 0, context->Lines, context->Header.width, - context->Header.height); + context->Header.height, + context->user_data); } } |