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 | 8b34aeb65a60521b86ecdd369574ee65f7f4b34c (patch) | |
| tree | 32a2e4751fea786e8b29b6081ea703ebcf126c95 /gdk-pixbuf/io-jpeg.c | |
| parent | 30caacfda69c0c7fa9ad7512ab44130ced188c45 (diff) | |
| download | gdk-pixbuf-8b34aeb65a60521b86ecdd369574ee65f7f4b34c.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-jpeg.c')
| -rw-r--r-- | gdk-pixbuf/io-jpeg.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c index 68660d4c7..4cea124e0 100644 --- a/gdk-pixbuf/io-jpeg.c +++ b/gdk-pixbuf/io-jpeg.c @@ -89,7 +89,10 @@ typedef struct { GdkPixbuf *image_load (FILE *f); gpointer image_begin_load (ModulePreparedNotifyFunc func, - ModuleUpdatedNotifyFunc func2, gpointer user_data); + ModuleUpdatedNotifyFunc func2, + ModuleFrameDoneNotifyFunc func3, + ModuleAnimationDoneNotifyFunc func4, + gpointer user_data); void image_stop_load (gpointer context); gboolean image_load_increment(gpointer context, guchar *buf, guint size); @@ -274,6 +277,8 @@ skip_input_data (j_decompress_ptr cinfo, long num_bytes) gpointer image_begin_load (ModulePreparedNotifyFunc prepared_func, ModuleUpdatedNotifyFunc updated_func, + ModuleFrameDoneNotifyFunc frame_func, + ModuleAnimationDoneNotifyFunc anim_done_func, gpointer user_data) { JpegProgContext *context; @@ -508,11 +513,11 @@ image_load_increment (gpointer data, guchar *buf, guint size) /* send updated signal */ (* context->updated_func) (context->pixbuf, - context->user_data, - 0, - cinfo->output_scanline-1, - cinfo->image_width, - nlines); + 0, + cinfo->output_scanline-1, + cinfo->image_width, + nlines, + context->user_data); #undef DEBUG_JPEG_PROGRESSIVE #ifdef DEBUG_JPEG_PROGRESSIVE |