]> Pileus Git - ~andy/gtk/blobdiff - gdk-pixbuf/io-jpeg.c
Cleanups
[~andy/gtk] / gdk-pixbuf / io-jpeg.c
index 119e9e51739ecee40b4d260c5246588f6f8b3992..3ec2292b4154270824efc4080a852e9384081cbd 100644 (file)
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "linux" -*- */
 /* GdkPixbuf library - JPEG image loader
  *
  * Copyright (C) 1999 Michael Zucchi
  *          Michael Fulbright <drmike@redhat.com>
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 
-/*
-  Progressive file loading notes (11/03/1999) <drmike@redhat.com>...
-
-  These are issues I know of and will be dealing with shortly:
-
-    -  Currently does not handle progressive jpegs - this
-       requires a change in the way image_load_increment () calls
-       libjpeg. Progressive jpegs are rarer but I will add this
-       support asap.
-
-    - error handling is not as good as it should be
-
- */
-
-
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#include "gdk-pixbuf.h"
+#include <jerror.h>
+#include "gdk-pixbuf-private.h"
 #include "gdk-pixbuf-io.h"
 
+#ifndef HAVE_SIGSETJMP
+#define sigjmp_buf jmp_buf
+#define sigsetjmp(jb, x) setjmp(jb)
+#define siglongjmp longjmp
+#endif
 \f
 
 /* we are a "source manager" as far as libjpeg is concerned */
-#define JPEG_PROG_BUF_SIZE 4096
+#define JPEG_PROG_BUF_SIZE 65536
 
 typedef struct {
        struct jpeg_source_mgr pub;   /* public fields */
 
        JOCTET buffer[JPEG_PROG_BUF_SIZE];              /* start of buffer */
        long  skip_next;              /* number of bytes to skip next read */
-
+       
 } my_source_mgr;
 
 typedef my_source_mgr * my_src_ptr;
@@ -69,13 +61,15 @@ typedef my_source_mgr * my_src_ptr;
 struct error_handler_data {
        struct jpeg_error_mgr pub;
        sigjmp_buf setjmp_buffer;
+        GError **error;
 };
 
 /* progressive loader context */
 typedef struct {
-       ModuleUpdatedNotifyFunc  updated_func;
-       ModulePreparedNotifyFunc prepared_func;
-       gpointer                 user_data;
+        GdkPixbufModuleSizeFunc     size_func;
+       GdkPixbufModuleUpdatedFunc  updated_func;
+       GdkPixbufModulePreparedFunc prepared_func;
+       gpointer                    user_data;
        
        GdkPixbuf                *pixbuf;
        guchar                   *dptr;   /* current position in pixbuf */
@@ -83,38 +77,59 @@ typedef struct {
        gboolean                 did_prescan;  /* are we in image data yet? */
        gboolean                 got_header;  /* have we loaded jpeg header? */
        gboolean                 src_initialized;/* TRUE when jpeg lib initialized */
+       gboolean                 in_output;   /* did we get suspended in an output pass? */
        struct jpeg_decompress_struct cinfo;
        struct error_handler_data     jerr;
 } JpegProgContext;
 
-GdkPixbuf *image_load (FILE *f);
-gpointer image_begin_load (ModulePreparedNotifyFunc func, 
-                          ModuleUpdatedNotifyFunc func2, gpointer user_data);
-void image_stop_load (gpointer context);
-gboolean image_load_increment(gpointer context, guchar *buf, guint size);
+static GdkPixbuf *gdk_pixbuf__jpeg_image_load (FILE *f, GError **error);
+static gpointer gdk_pixbuf__jpeg_image_begin_load (GdkPixbufModuleSizeFunc           func0,
+                                                   GdkPixbufModulePreparedFunc func1, 
+                                                   GdkPixbufModuleUpdatedFunc func2,
+                                                   gpointer user_data,
+                                                   GError **error);
+static gboolean gdk_pixbuf__jpeg_image_stop_load (gpointer context, GError **error);
+static gboolean gdk_pixbuf__jpeg_image_load_increment(gpointer context,
+                                                      const guchar *buf, guint size,
+                                                      GError **error);
 
 
 static void
 fatal_error_handler (j_common_ptr cinfo)
 {
-       /* FIXME:
-        * We should somehow signal what error occurred to the caller so the
-        * caller can handle the error message */
        struct error_handler_data *errmgr;
-
+        char buffer[JMSG_LENGTH_MAX];
+        
        errmgr = (struct error_handler_data *) cinfo->err;
-       cinfo->err->output_message (cinfo);
+        
+        /* Create the message */
+        (* cinfo->err->format_message) (cinfo, buffer);
+
+        /* broken check for *error == NULL for robustness against
+         * crappy JPEG library
+         */
+        if (errmgr->error && *errmgr->error == NULL) {
+                g_set_error (errmgr->error,
+                             GDK_PIXBUF_ERROR,
+                             cinfo->err->msg_code == JERR_OUT_OF_MEMORY 
+                            ? GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY 
+                            : GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                             _("Error interpreting JPEG image file (%s)"),
+                             buffer);
+        }
+        
        siglongjmp (errmgr->setjmp_buffer, 1);
-       return;
+
+        g_assert_not_reached ();
 }
 
-/* Destroy notification function for the libart pixbuf */
 static void
-free_buffer (gpointer user_data, gpointer data)
+output_message_handler (j_common_ptr cinfo)
 {
-       free (data);
-}
+  /* This method keeps libjpeg from dumping crap to stderr */
 
+  /* do nothing */
+}
 
 /* explode gray image data from jpeg library into rgb components in pixbuf */
 static void
@@ -126,11 +141,12 @@ explode_gray_into_buf (struct jpeg_decompress_struct *cinfo,
 
        g_return_if_fail (cinfo != NULL);
        g_return_if_fail (cinfo->output_components == 1);
+       g_return_if_fail (cinfo->out_color_space == JCS_GRAYSCALE);
 
        /* Expand grey->colour.  Expand from the end of the
         * memory down, so we can use the same buffer.
         */
-       w = cinfo->image_width;
+       w = cinfo->output_width;
        for (i = cinfo->rec_outbuf_height - 1; i >= 0; i--) {
                guchar *from, *to;
                
@@ -146,12 +162,127 @@ explode_gray_into_buf (struct jpeg_decompress_struct *cinfo,
        }
 }
 
+
+static void
+convert_cmyk_to_rgb (struct jpeg_decompress_struct *cinfo,
+                    guchar **lines) 
+{
+       gint i, j;
+
+       g_return_if_fail (cinfo != NULL);
+       g_return_if_fail (cinfo->output_components == 4);
+       g_return_if_fail (cinfo->out_color_space == JCS_CMYK);
+
+       for (i = cinfo->rec_outbuf_height - 1; i >= 0; i--) {
+               guchar *p;
+               
+               p = lines[i];
+               for (j = 0; j < cinfo->output_width; j++) {
+                       int c, m, y, k;
+                       c = p[0];
+                       m = p[1];
+                       y = p[2];
+                       k = p[3];
+                       if (cinfo->saw_Adobe_marker) {
+                               p[0] = k*c / 255;
+                               p[1] = k*m / 255;
+                               p[2] = k*y / 255;
+                       }
+                       else {
+                               p[0] = (255 - k)*(255 - c) / 255;
+                               p[1] = (255 - k)*(255 - m) / 255;
+                               p[2] = (255 - k)*(255 - y) / 255;
+                       }
+                       p[3] = 255;
+                       p += 4;
+               }
+       }
+}
+
+typedef struct {
+  struct jpeg_source_mgr pub;  /* public fields */
+
+  FILE * infile;               /* source stream */
+  JOCTET * buffer;             /* start of buffer */
+  boolean start_of_file;       /* have we gotten any data yet? */
+} stdio_source_mgr;
+
+typedef stdio_source_mgr * stdio_src_ptr;
+
+static void
+stdio_init_source (j_decompress_ptr cinfo)
+{
+  stdio_src_ptr src = (stdio_src_ptr)cinfo->src;
+  src->start_of_file = FALSE;
+}
+
+static boolean
+stdio_fill_input_buffer (j_decompress_ptr cinfo)
+{
+  stdio_src_ptr src = (stdio_src_ptr) cinfo->src;
+  size_t nbytes;
+
+  nbytes = fread (src->buffer, 1, JPEG_PROG_BUF_SIZE, src->infile);
+
+  if (nbytes <= 0) {
+#if 0
+    if (src->start_of_file)    /* Treat empty input file as fatal error */
+      ERREXIT(cinfo, JERR_INPUT_EMPTY);
+    WARNMS(cinfo, JWRN_JPEG_EOF);
+#endif
+    /* Insert a fake EOI marker */
+    src->buffer[0] = (JOCTET) 0xFF;
+    src->buffer[1] = (JOCTET) JPEG_EOI;
+    nbytes = 2;
+  }
+
+  src->pub.next_input_byte = src->buffer;
+  src->pub.bytes_in_buffer = nbytes;
+  src->start_of_file = FALSE;
+
+  return TRUE;
+}
+
+static void
+stdio_skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+  stdio_src_ptr src = (stdio_src_ptr) cinfo->src;
+
+  if (num_bytes > 0) {
+    while (num_bytes > (long) src->pub.bytes_in_buffer) {
+      num_bytes -= (long) src->pub.bytes_in_buffer;
+      (void)stdio_fill_input_buffer(cinfo);
+    }
+    src->pub.next_input_byte += (size_t) num_bytes;
+    src->pub.bytes_in_buffer -= (size_t) num_bytes;
+  }
+}
+
+static void
+stdio_term_source (j_decompress_ptr cinfo)
+{
+}
+
+static gchar *
+colorspace_name (const J_COLOR_SPACE jpeg_color_space) 
+{
+       switch (jpeg_color_space) {
+           case JCS_UNKNOWN: return "UNKNOWN"; 
+           case JCS_GRAYSCALE: return "GRAYSCALE"; 
+           case JCS_RGB: return "RGB"; 
+           case JCS_YCbCr: return "YCbCr"; 
+           case JCS_CMYK: return "CMYK"; 
+           case JCS_YCCK: return "YCCK";
+           default: return "invalid";
+       }
+}
+
 /* Shared library entry point */
-GdkPixbuf *
-image_load (FILE *f)
+static GdkPixbuf *
+gdk_pixbuf__jpeg_image_load (FILE *f, GError **error)
 {
-       gint w, h, i;
-       guchar *pixels = NULL;
+       gint i;
+       GdkPixbuf * volatile pixbuf = NULL;
        guchar *dptr;
        guchar *lines[4]; /* Used to expand rows, via rec_outbuf_height, 
                            * from the header file: 
@@ -161,15 +292,19 @@ image_load (FILE *f)
        guchar **lptr;
        struct jpeg_decompress_struct cinfo;
        struct error_handler_data jerr;
+       stdio_src_ptr src;
 
        /* setup error handler */
        cinfo.err = jpeg_std_error (&jerr.pub);
        jerr.pub.error_exit = fatal_error_handler;
+        jerr.pub.output_message = output_message_handler;
 
+        jerr.error = error;
+        
        if (sigsetjmp (jerr.setjmp_buffer, 1)) {
                /* Whoops there was a jpeg error */
-               if (pixels)
-                       free (pixels);
+               if (pixbuf)
+                       g_object_unref (pixbuf);
 
                jpeg_destroy_decompress (&cinfo);
                return NULL;
@@ -177,44 +312,90 @@ image_load (FILE *f)
 
        /* load header, setup */
        jpeg_create_decompress (&cinfo);
-       jpeg_stdio_src (&cinfo, f);
+
+       cinfo.src = (struct jpeg_source_mgr *)
+         (*cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_PERMANENT,
+                                 sizeof (stdio_source_mgr));
+       src = (stdio_src_ptr) cinfo.src;
+       src->buffer = (JOCTET *)
+         (*cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_PERMANENT,
+                                     JPEG_PROG_BUF_SIZE * sizeof (JOCTET));
+
+       src->pub.init_source = stdio_init_source;
+       src->pub.fill_input_buffer = stdio_fill_input_buffer;
+       src->pub.skip_input_data = stdio_skip_input_data;
+       src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+       src->pub.term_source = stdio_term_source;
+       src->infile = f;
+       src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
+       src->pub.next_input_byte = NULL; /* until buffer loaded */
+
        jpeg_read_header (&cinfo, TRUE);
        jpeg_start_decompress (&cinfo);
        cinfo.do_fancy_upsampling = FALSE;
        cinfo.do_block_smoothing = FALSE;
 
-       w = cinfo.output_width;
-       h = cinfo.output_height;
-
-       pixels = g_malloc (h * w * 3);
-       if (!pixels) {
+       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 
+                                cinfo.out_color_components == 4 ? TRUE : FALSE, 
+                                8, cinfo.output_width, cinfo.output_height);
+             
+       if (!pixbuf) {
                jpeg_destroy_decompress (&cinfo);
+
+                /* broken check for *error == NULL for robustness against
+                 * crappy JPEG library
+                 */
+                if (error && *error == NULL) {
+                        g_set_error (error,
+                                     GDK_PIXBUF_ERROR,
+                                     GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                                     _("Insufficient memory to load image, try exiting some applications to free memory"));
+                }
+                
                return NULL;
        }
 
-       dptr = pixels;
+       dptr = pixbuf->pixels;
 
        /* decompress all the lines, a few at a time */
-
        while (cinfo.output_scanline < cinfo.output_height) {
                lptr = lines;
                for (i = 0; i < cinfo.rec_outbuf_height; i++) {
                        *lptr++ = dptr;
-                       dptr += w * 3;
+                       dptr += pixbuf->rowstride;
                }
 
                jpeg_read_scanlines (&cinfo, lines, cinfo.rec_outbuf_height);
 
-               if (cinfo.output_components == 1)
-                       explode_gray_into_buf (&cinfo, lines);
+               switch (cinfo.out_color_space) {
+                   case JCS_GRAYSCALE:
+                     explode_gray_into_buf (&cinfo, lines);
+                     break;
+                   case JCS_RGB:
+                     /* do nothing */
+                     break;
+                   case JCS_CMYK:
+                     convert_cmyk_to_rgb (&cinfo, lines);
+                     break;
+                   default:
+                     g_object_unref (pixbuf);
+                     if (error && *error == NULL) {
+                        g_set_error (error,
+                                     GDK_PIXBUF_ERROR,
+                                    GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
+                                    _("Unsupported JPEG color space (%s)"),
+                                    colorspace_name (cinfo.out_color_space)); 
+                     }
+                
+                     jpeg_destroy_decompress (&cinfo);
+                     return NULL;
+               }
        }
 
        jpeg_finish_decompress (&cinfo);
        jpeg_destroy_decompress (&cinfo);
 
-       return gdk_pixbuf_new_from_data (pixels, ART_PIX_RGB, FALSE,
-                                        w, h, w * 3,
-                                        free_buffer, NULL);
+       return pixbuf;
 }
 
 
@@ -271,15 +452,18 @@ skip_input_data (j_decompress_ptr cinfo, long num_bytes)
  * return context (opaque to user)
  */
 
-gpointer
-image_begin_load (ModulePreparedNotifyFunc prepared_func, 
-                 ModuleUpdatedNotifyFunc  updated_func,
-                 gpointer user_data)
+static gpointer
+gdk_pixbuf__jpeg_image_begin_load (GdkPixbufModuleSizeFunc size_func,
+                                  GdkPixbufModulePreparedFunc prepared_func, 
+                                  GdkPixbufModuleUpdatedFunc updated_func,
+                                  gpointer user_data,
+                                   GError **error)
 {
        JpegProgContext *context;
        my_source_mgr   *src;
 
        context = g_new0 (JpegProgContext, 1);
+       context->size_func = size_func;
        context->prepared_func = prepared_func;
        context->updated_func  = updated_func;
        context->user_data = user_data;
@@ -287,15 +471,28 @@ image_begin_load (ModulePreparedNotifyFunc prepared_func,
        context->got_header = FALSE;
        context->did_prescan = FALSE;
        context->src_initialized = FALSE;
+       context->in_output = FALSE;
 
        /* create libjpeg structures */
        jpeg_create_decompress (&context->cinfo);
 
-       context->cinfo.src = (struct jpeg_source_mgr *) g_new0 (my_source_mgr, 1);
+       context->cinfo.src = (struct jpeg_source_mgr *) g_try_malloc (sizeof (my_source_mgr));
+       if (!context->cinfo.src) {
+               g_set_error (error,
+                            GDK_PIXBUF_ERROR,
+                            GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                            _("Couldn't allocate memory for loading JPEG file"));
+               return NULL;
+       }
+       memset (context->cinfo.src, 0, sizeof (my_source_mgr));
+       
        src = (my_src_ptr) context->cinfo.src;
 
        context->cinfo.err = jpeg_std_error (&context->jerr.pub);
-
+       context->jerr.pub.error_exit = fatal_error_handler;
+        context->jerr.pub.output_message = output_message_handler;
+        context->jerr.error = error;
+        
        src = (my_src_ptr) context->cinfo.src;
        src->pub.init_source = init_source;
        src->pub.fill_input_buffer = fill_input_buffer;
@@ -305,6 +502,8 @@ image_begin_load (ModulePreparedNotifyFunc prepared_func,
        src->pub.bytes_in_buffer = 0;
        src->pub.next_input_byte = NULL;
 
+        context->jerr.error = NULL;
+        
        return (gpointer) context;
 }
 
@@ -313,18 +512,27 @@ image_begin_load (ModulePreparedNotifyFunc prepared_func,
  *
  * free context, unref gdk_pixbuf
  */
-void
-image_stop_load (gpointer data)
+static gboolean
+gdk_pixbuf__jpeg_image_stop_load (gpointer data, GError **error)
 {
        JpegProgContext *context = (JpegProgContext *) data;
 
-       g_return_if_fail (context != NULL);
-
+       g_return_val_if_fail (context != NULL, TRUE);
+       
+        /* FIXME this thing needs to report errors if
+         * we have unused image data
+         */
+        
        if (context->pixbuf)
-               gdk_pixbuf_unref (context->pixbuf);
-
-       jpeg_finish_decompress(&context->cinfo);
-       jpeg_destroy_decompress(&context->cinfo);
+               g_object_unref (context->pixbuf);
+       
+       /* if we have an error? */
+       if (sigsetjmp (context->jerr.setjmp_buffer, 1)) {
+               jpeg_destroy_decompress (&context->cinfo);
+       } else {
+               jpeg_finish_decompress(&context->cinfo);
+               jpeg_destroy_decompress(&context->cinfo);
+       }
 
        if (context->cinfo.src) {
                my_src_ptr src = (my_src_ptr) context->cinfo.src;
@@ -333,9 +541,71 @@ image_stop_load (gpointer data)
        }
 
        g_free (context);
+
+        return TRUE;
 }
 
 
+static gboolean
+gdk_pixbuf__jpeg_image_load_lines (JpegProgContext  *context,
+                                   GError          **error)
+{
+        struct jpeg_decompress_struct *cinfo = &context->cinfo;
+        guchar *lines[4];
+        guchar **lptr;
+        guchar *rowptr;
+        gint   nlines, i;
+
+        /* keep going until we've done all scanlines */
+        while (cinfo->output_scanline < cinfo->output_height) {
+                lptr = lines;
+                rowptr = context->dptr;
+                for (i=0; i < cinfo->rec_outbuf_height; i++) {
+                        *lptr++ = rowptr;
+                        rowptr += context->pixbuf->rowstride;
+                }
+
+                nlines = jpeg_read_scanlines (cinfo, lines,
+                                              cinfo->rec_outbuf_height);
+                if (nlines == 0)
+                        break;
+
+                switch (cinfo->out_color_space) {
+                case JCS_GRAYSCALE:
+                        explode_gray_into_buf (cinfo, lines);
+                        break;
+                case JCS_RGB:
+                        /* do nothing */
+                        break;
+                case JCS_CMYK:
+                        convert_cmyk_to_rgb (cinfo, lines);
+                        break;
+                default:
+                        if (error && *error == NULL) {
+                                g_set_error (error,
+                                             GDK_PIXBUF_ERROR,
+                                             GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
+                                             _("Unsupported JPEG color space (%s)"),
+                                             colorspace_name (cinfo->out_color_space));
+                        }
+
+                        return FALSE;
+                }
+
+                context->dptr += nlines * context->pixbuf->rowstride;
+
+                /* send updated signal */
+               if (context->updated_func)
+                       (* context->updated_func) (context->pixbuf,
+                                                  0,
+                                                  cinfo->output_scanline - 1,
+                                                  cinfo->image_width,
+                                                  nlines,
+                                                  context->user_data);
+        }
+
+        return TRUE;
+}
 
 
 /*
@@ -345,8 +615,10 @@ image_stop_load (gpointer data)
  *
  * append image data onto inrecrementally built output image
  */
-gboolean
-image_load_increment (gpointer data, guchar *buf, guint size)
+static gboolean
+gdk_pixbuf__jpeg_image_load_increment (gpointer data,
+                                       const guchar *buf, guint size,
+                                       GError **error)
 {
        JpegProgContext *context = (JpegProgContext *)data;
        struct jpeg_decompress_struct *cinfo;
@@ -354,7 +626,9 @@ image_load_increment (gpointer data, guchar *buf, guint size)
        guint       num_left, num_copy;
        guint       last_bytes_left;
        guint       spinguard;
-       guchar *bufhd;
+       gboolean    first;
+       const guchar *bufhd;
+       gint        width, height;
 
        g_return_val_if_fail (context != NULL, FALSE);
        g_return_val_if_fail (buf != NULL, FALSE);
@@ -363,10 +637,12 @@ image_load_increment (gpointer data, guchar *buf, guint size)
 
        cinfo = &context->cinfo;
 
-       /* XXXXXXX (drmike) - loop(s) below need to be recoded now I
-         *                    have a grasp of what the flow needs to be!
-         */
-
+        context->jerr.error = error;
+        
+       /* check for fatal error */
+       if (sigsetjmp (context->jerr.setjmp_buffer, 1)) {
+               return FALSE;
+       }
 
        /* skip over data if requested, handle unsigned int sizes cleanly */
        /* only can happen if we've already called jpeg_get_header once   */
@@ -384,10 +660,13 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                bufhd = buf;
        }
 
+       if (num_left == 0)
+               return TRUE;
 
        last_bytes_left = 0;
        spinguard = 0;
-       while (src->pub.bytes_in_buffer != 0 || num_left != 0) {
+       first = TRUE;
+       while (TRUE) {
 
                /* handle any data from caller we haven't processed yet */
                if (num_left > 0) {
@@ -400,9 +679,6 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                        num_copy = MIN (JPEG_PROG_BUF_SIZE - src->pub.bytes_in_buffer,
                                        num_left);
 
-/*                     if (num_copy == 0) 
-                               g_error ("Buffer overflow!");
-*/
                        memcpy(src->buffer + src->pub.bytes_in_buffer, bufhd,num_copy);
                        src->pub.next_input_byte = src->buffer;
                        src->pub.bytes_in_buffer += num_copy;
@@ -410,9 +686,10 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                        num_left -= num_copy;
                } else {
                /* did anything change from last pass, if not return */
-                       if (last_bytes_left == 0)
+                       if (first) {
                                last_bytes_left = src->pub.bytes_in_buffer;
-                       else if (src->pub.bytes_in_buffer == last_bytes_left)
+                               first = FALSE;
+                       } else if (src->pub.bytes_in_buffer == last_bytes_left)
                                spinguard++;
                        else
                                last_bytes_left = src->pub.bytes_in_buffer;
@@ -425,43 +702,60 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                /* try to load jpeg header */
                if (!context->got_header) {
                        int rc;
-
+                       
                        rc = jpeg_read_header (cinfo, TRUE);
                        context->src_initialized = TRUE;
-
+                       
                        if (rc == JPEG_SUSPENDED)
                                continue;
-
+                       
                        context->got_header = TRUE;
-
-                       if (jpeg_has_multiple_scans (cinfo)) {
-                               g_print ("io-jpeg.c: Does not currently "
-                                        "support progressive jpeg files.\n");
-                               return FALSE;
+                       
+                       width = cinfo->image_width;
+                       height = cinfo->image_height;
+                       if (context->size_func) {
+                               (* context->size_func) (&width, &height, context->user_data);
+                               if (width == 0 || height == 0)
+                                       return FALSE;
                        }
-
-                       context->pixbuf = gdk_pixbuf_new(ART_PIX_RGB, 
-                                                        /*have_alpha*/ FALSE,
-                                                        8, 
-                                                        cinfo->image_width,
-                                                        cinfo->image_height);
+                       
+                       for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
+                               jpeg_calc_output_dimensions (cinfo);
+                               if (cinfo->output_width < width || cinfo->output_height < height) {
+                                       cinfo->scale_denom /= 2;
+                                       break;
+                               }
+                       }
+                       jpeg_calc_output_dimensions (cinfo);
+                       
+                       context->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 
+                                                         cinfo->output_components == 4 ? TRUE : FALSE,
+                                                         8, 
+                                                         cinfo->output_width,
+                                                         cinfo->output_height);
 
                        if (context->pixbuf == NULL) {
-                               /* Failed to allocate memory */
-                               g_error ("Couldn't allocate gdkpixbuf");
+                                g_set_error (error,
+                                             GDK_PIXBUF_ERROR,
+                                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                                             _("Couldn't allocate memory for loading JPEG file"));
+                                return FALSE;
                        }
-
+                       
                        /* Use pixbuf buffer to store decompressed data */
-                       context->dptr = context->pixbuf->art_pixbuf->pixels;
-
+                       context->dptr = context->pixbuf->pixels;
+                       
                        /* Notify the client that we are ready to go */
-                       (* context->prepared_func) (context->pixbuf,
-                                                   context->user_data);
-
+                       if (context->prepared_func)
+                               (* context->prepared_func) (context->pixbuf,
+                                                           NULL,
+                                                           context->user_data);
+                       
                } else if (!context->did_prescan) {
-                       int rc;
-
+                       int rc;                 
+                       
                        /* start decompression */
+                       cinfo->buffered_image = cinfo->progressive_mode;
                        rc = jpeg_start_decompress (cinfo);
                        cinfo->do_fancy_upsampling = FALSE;
                        cinfo->do_block_smoothing = FALSE;
@@ -470,74 +764,343 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                                continue;
 
                        context->did_prescan = TRUE;
+               } else if (!cinfo->buffered_image) {
+                        /* we're decompressing unbuffered so
+                         * simply get scanline by scanline from jpeg lib
+                         */
+                        if (! gdk_pixbuf__jpeg_image_load_lines (context,
+                                                                 error))
+                                return FALSE;
+
+                       if (cinfo->output_scanline >= cinfo->output_height)
+                               return TRUE;
                } else {
-                       /* we're decompressing so feed jpeg lib scanlines */
-                       guchar *lines[4];
-                       guchar **lptr;
-                       guchar *rowptr, *p;
-                       gint   nlines, i;
-                       gint   start_scanline;
-
-                       /* keep going until we've done all scanlines */
-                       while (cinfo->output_scanline < cinfo->output_height) {
-                               start_scanline = cinfo->output_scanline;
-                               lptr = lines;
-                               rowptr = context->dptr;
-                               for (i=0; i < cinfo->rec_outbuf_height; i++) {
-                                       *lptr++ = rowptr;
-                                       rowptr += context->pixbuf->art_pixbuf->rowstride;;
+                        /* we're decompressing buffered (progressive)
+                         * so feed jpeg lib scanlines
+                         */
+
+                       /* keep going until we've done all passes */
+                       while (!jpeg_input_complete (cinfo)) {
+                               if (!context->in_output) {
+                                       if (jpeg_start_output (cinfo, cinfo->input_scan_number)) {
+                                               context->in_output = TRUE;
+                                               context->dptr = context->pixbuf->pixels;
+                                       }
+                                       else
+                                               break;
                                }
 
-#ifdef IO_JPEG_DEBUG_GREY
-                               for (p=lines[0],i=0; i< context->pixbuf->art_pixbuf->rowstride;i++, p++)
-                                       *p = 0;
-                               
-#endif
-                               nlines = jpeg_read_scanlines (cinfo, lines,
-                                                             cinfo->rec_outbuf_height);
-                               if (nlines == 0)
-                                       break;
+                                /* get scanlines from jpeg lib */
+                                if (! gdk_pixbuf__jpeg_image_load_lines (context,
+                                                                         error))
+                                        return FALSE;
 
-                               /* handle gray */
-                               if (cinfo->output_components == 1)
-                                       explode_gray_into_buf (cinfo, lines);
-
-                               context->dptr += nlines * context->pixbuf->art_pixbuf->rowstride;
-
-                               /* send updated signal */
-                               (* context->updated_func) (context->pixbuf,
-                                                context->user_data,
-                                                0, 
-                                                cinfo->output_scanline-1,
-                                                cinfo->image_width, 
-                                                nlines);
-
-#undef DEBUG_JPEG_PROGRESSIVE
-#ifdef DEBUG_JPEG_PROGRESSIVE
-                               
-                               if (start_scanline != cinfo->output_scanline)
-                                       g_print("jpeg: Input pass=%2d, next input scanline=%3d,"
-                                               " emitted %3d - %3d\n",
-                                               cinfo->input_scan_number, cinfo->input_iMCU_row * 16,
-                                               start_scanline, cinfo->output_scanline - 1);
-                               
-                               
-                               
-                               g_print ("Scanline %d of %d - ", 
-                                        cinfo->output_scanline,
-                                        cinfo->output_height);
-/*                     g_print ("rec_height %d -", cinfo->rec_outbuf_height); */
-                               g_print ("Processed %d lines - bytes left = %d\n",
-                                        nlines, cinfo->src->bytes_in_buffer);
-#endif
+                               if (cinfo->output_scanline >= cinfo->output_height &&
+                                   jpeg_finish_output (cinfo))
+                                       context->in_output = FALSE;
+                               else
+                                       break;
                        }
-                       /* did entire image */
-                       if (cinfo->output_scanline >= cinfo->output_height)
+                       if (jpeg_input_complete (cinfo))
+                               /* did entire image */
                                return TRUE;
                        else
                                continue;
                }
        }
+}
+
+/* Save */
+
+#define TO_FUNCTION_BUF_SIZE 4096
+
+typedef struct {
+       struct jpeg_destination_mgr pub;
+       JOCTET             *buffer;
+       GdkPixbufSaveFunc   save_func;
+       gpointer            user_data;
+       GError            **error;
+} ToFunctionDestinationManager;
+
+void
+to_callback_init (j_compress_ptr cinfo)
+{
+       ToFunctionDestinationManager *destmgr;
+
+       destmgr = (ToFunctionDestinationManager*) cinfo->dest;
+       destmgr->pub.next_output_byte = destmgr->buffer;
+       destmgr->pub.free_in_buffer = TO_FUNCTION_BUF_SIZE;
+}
+
+static void
+to_callback_do_write (j_compress_ptr cinfo, gsize length)
+{
+       ToFunctionDestinationManager *destmgr;
+
+       destmgr = (ToFunctionDestinationManager*) cinfo->dest;
+        if (!destmgr->save_func (destmgr->buffer,
+                                length,
+                                destmgr->error,
+                                destmgr->user_data)) {
+               struct error_handler_data *errmgr;
+        
+               errmgr = (struct error_handler_data *) cinfo->err;
+               /* Use a default error message if the callback didn't set one,
+                * which it should have.
+                */
+               if (errmgr->error && *errmgr->error == NULL) {
+                       g_set_error (errmgr->error,
+                                    GDK_PIXBUF_ERROR,
+                                    GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                                    "write function failed");
+               }
+               siglongjmp (errmgr->setjmp_buffer, 1);
+               g_assert_not_reached ();
+        }
+}
+
+static boolean
+to_callback_empty_output_buffer (j_compress_ptr cinfo)
+{
+       ToFunctionDestinationManager *destmgr;
 
+       destmgr = (ToFunctionDestinationManager*) cinfo->dest;
+       to_callback_do_write (cinfo, TO_FUNCTION_BUF_SIZE);
+       destmgr->pub.next_output_byte = destmgr->buffer;
+       destmgr->pub.free_in_buffer = TO_FUNCTION_BUF_SIZE;
        return TRUE;
 }
+
+void
+to_callback_terminate (j_compress_ptr cinfo)
+{
+       ToFunctionDestinationManager *destmgr;
+
+       destmgr = (ToFunctionDestinationManager*) cinfo->dest;
+       to_callback_do_write (cinfo, TO_FUNCTION_BUF_SIZE - destmgr->pub.free_in_buffer);
+}
+
+static gboolean
+real_save_jpeg (GdkPixbuf          *pixbuf,
+               gchar             **keys,
+               gchar             **values,
+               GError            **error,
+               gboolean            to_callback,
+               FILE               *f,
+               GdkPixbufSaveFunc   save_func,
+               gpointer            user_data)
+{
+        /* FIXME error handling is broken */
+        
+       struct jpeg_compress_struct cinfo;
+       guchar *buf = NULL;
+       guchar *ptr;
+       guchar *pixels = NULL;
+       JSAMPROW *jbuf;
+       int y = 0;
+       volatile int quality = 75; /* default; must be between 0 and 100 */
+       int i, j;
+       int w, h = 0;
+       int rowstride = 0;
+       int n_channels;
+       struct error_handler_data jerr;
+       ToFunctionDestinationManager to_callback_destmgr;
+
+       to_callback_destmgr.buffer = NULL;
+
+       if (keys && *keys) {
+               gchar **kiter = keys;
+               gchar **viter = values;
+
+               while (*kiter) {
+                       if (strcmp (*kiter, "quality") == 0) {
+                               char *endptr = NULL;
+                               quality = strtol (*viter, &endptr, 10);
+
+                               if (endptr == *viter) {
+                                       g_set_error (error,
+                                                    GDK_PIXBUF_ERROR,
+                                                    GDK_PIXBUF_ERROR_BAD_OPTION,
+                                                    _("JPEG quality must be a value between 0 and 100; value '%s' could not be parsed."),
+                                                    *viter);
+
+                                       return FALSE;
+                               }
+                               
+                               if (quality < 0 ||
+                                   quality > 100) {
+                                       /* This is a user-visible error;
+                                        * lets people skip the range-checking
+                                        * in their app.
+                                        */
+                                       g_set_error (error,
+                                                    GDK_PIXBUF_ERROR,
+                                                    GDK_PIXBUF_ERROR_BAD_OPTION,
+                                                    _("JPEG quality must be a value between 0 and 100; value '%d' is not allowed."),
+                                                    quality);
+
+                                       return FALSE;
+                               }
+                       } else {
+                               g_warning ("Bad option name '%s' passed to JPEG saver",
+                                          *kiter);
+                               return FALSE;
+                       }
+               
+                       ++kiter;
+                       ++viter;
+               }
+       }
+       
+       rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+       n_channels = gdk_pixbuf_get_n_channels (pixbuf);
+
+       w = gdk_pixbuf_get_width (pixbuf);
+       h = gdk_pixbuf_get_height (pixbuf);
+
+       /* no image data? abort */
+       pixels = gdk_pixbuf_get_pixels (pixbuf);
+       g_return_val_if_fail (pixels != NULL, FALSE);
+
+       /* Allocate a small buffer to convert image data,
+       * and a larger buffer if doing to_callback save.
+       */
+       buf = g_try_malloc (w * 3 * sizeof (guchar));
+       if (!buf) {
+              g_set_error (error,
+                           GDK_PIXBUF_ERROR,
+                           GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                           _("Couldn't allocate memory for loading JPEG file"));
+              return FALSE;
+       }
+       if (to_callback) {
+              to_callback_destmgr.buffer = g_try_malloc (TO_FUNCTION_BUF_SIZE);
+              if (!to_callback_destmgr.buffer) {
+                      g_set_error (error,
+                                   GDK_PIXBUF_ERROR,
+                                   GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                                   _("Couldn't allocate memory for loading JPEG file"));
+                      return FALSE;
+              }
+       }
+
+       /* set up error handling */
+       jerr.pub.error_exit = fatal_error_handler;
+       jerr.pub.output_message = output_message_handler;
+       jerr.error = error;
+       
+       cinfo.err = jpeg_std_error (&(jerr.pub));
+       if (sigsetjmp (jerr.setjmp_buffer, 1)) {
+               jpeg_destroy_compress (&cinfo);
+               g_free (buf);
+              g_free (to_callback_destmgr.buffer);
+               return FALSE;
+       }
+
+       /* setup compress params */
+       jpeg_create_compress (&cinfo);
+       if (to_callback) {
+              to_callback_destmgr.pub.init_destination    = to_callback_init;
+              to_callback_destmgr.pub.empty_output_buffer = to_callback_empty_output_buffer;
+              to_callback_destmgr.pub.term_destination    = to_callback_terminate;
+              to_callback_destmgr.error = error;
+              to_callback_destmgr.save_func = save_func;
+              to_callback_destmgr.user_data = user_data;
+              cinfo.dest = (struct jpeg_destination_mgr*) &to_callback_destmgr;
+       } else {
+              jpeg_stdio_dest (&cinfo, f);
+       }
+       cinfo.image_width      = w;
+       cinfo.image_height     = h;
+       cinfo.input_components = 3; 
+       cinfo.in_color_space   = JCS_RGB;
+
+       /* set up jepg compression parameters */
+       jpeg_set_defaults (&cinfo);
+       jpeg_set_quality (&cinfo, quality, TRUE);
+       jpeg_start_compress (&cinfo, TRUE);
+       /* get the start pointer */
+       ptr = pixels;
+       /* go one scanline at a time... and save */
+       i = 0;
+       while (cinfo.next_scanline < cinfo.image_height) {
+               /* convert scanline from ARGB to RGB packed */
+               for (j = 0; j < w; j++)
+                       memcpy (&(buf[j*3]), &(ptr[i*rowstride + j*n_channels]), 3);
+
+               /* write scanline */
+               jbuf = (JSAMPROW *)(&buf);
+               jpeg_write_scanlines (&cinfo, jbuf, 1);
+               i++;
+               y++;
+
+       }
+       
+       /* finish off */
+       jpeg_finish_compress (&cinfo);
+       jpeg_destroy_compress(&cinfo);
+       g_free (buf);
+       g_free (to_callback_destmgr.buffer);
+       return TRUE;
+}
+
+static gboolean
+gdk_pixbuf__jpeg_image_save (FILE          *f, 
+                             GdkPixbuf     *pixbuf, 
+                             gchar        **keys,
+                             gchar        **values,
+                             GError       **error)
+{
+       return real_save_jpeg (pixbuf, keys, values, error,
+                              FALSE, f, NULL, NULL);
+}
+
+static gboolean
+gdk_pixbuf__jpeg_image_save_to_callback (GdkPixbufSaveFunc   save_func,
+                                        gpointer            user_data,
+                                        GdkPixbuf          *pixbuf, 
+                                        gchar             **keys,
+                                        gchar             **values,
+                                        GError            **error)
+{
+       return real_save_jpeg (pixbuf, keys, values, error,
+                              TRUE, NULL, save_func, user_data);
+}
+
+void
+MODULE_ENTRY (jpeg, fill_vtable) (GdkPixbufModule *module)
+{
+       module->load = gdk_pixbuf__jpeg_image_load;
+       module->begin_load = gdk_pixbuf__jpeg_image_begin_load;
+       module->stop_load = gdk_pixbuf__jpeg_image_stop_load;
+       module->load_increment = gdk_pixbuf__jpeg_image_load_increment;
+       module->save = gdk_pixbuf__jpeg_image_save;
+       module->save_to_callback = gdk_pixbuf__jpeg_image_save_to_callback;
+}
+
+void
+MODULE_ENTRY (jpeg, fill_info) (GdkPixbufFormat *info)
+{
+       static GdkPixbufModulePattern signature[] = {
+               { "\xff\xd8", NULL, 100 },
+               { NULL, NULL, 0 }
+       };
+       static gchar * mime_types[] = {
+               "image/jpeg",
+               NULL
+       };
+       static gchar * extensions[] = {
+               "jpeg",
+               "jpe",
+               "jpg",
+               NULL
+       };
+
+       info->name = "jpeg";
+       info->signature = signature;
+       info->description = N_("The JPEG image format");
+       info->mime_types = mime_types;
+       info->extensions = extensions;
+       info->flags = GDK_PIXBUF_FORMAT_WRITABLE | GDK_PIXBUF_FORMAT_THREADSAFE;
+       info->license = "LGPL";
+}