From 8f48c4b3cd6cf0643a7a1703de0f2c886a749228 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 5 Jan 2000 23:06:13 +0000 Subject: Change the order of the update func to make it more compatible with the 2000-01-05 Jonathan Blandford * 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 --- gdk-pixbuf/io-bmp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gdk-pixbuf/io-bmp.c') diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c index ebce8d7b75..65d65f1be3 100644 --- a/gdk-pixbuf/io-bmp.c +++ b/gdk-pixbuf/io-bmp.c @@ -173,7 +173,10 @@ struct bmp_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); @@ -189,7 +192,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); @@ -303,7 +306,10 @@ static void DecodeHeader(unsigned char *BFH, unsigned char *BIH, 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 bmp_progressive_state *context; @@ -529,11 +535,11 @@ static void OneLine(struct bmp_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); } } -- cgit v1.2.1