]> Pileus Git - ~andy/gtk/blobdiff - gdk-pixbuf/io-tiff.c
Cleanups
[~andy/gtk] / gdk-pixbuf / io-tiff.c
index 771a05267442f7824a9f66236b8a8a38ab02394c..455d3691d7f953577c14d48eee504ec4ce9bd862 100644 (file)
-/*
- * io-tiff.c: GdkPixBuf I/O for TIFF files.
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/* GdkPixbuf library - TIFF image loader
+ *
  * Copyright (C) 1999 Mark Crichton
- * Author: Mark Crichton <crichton@gimp.org>
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Authors: Mark Crichton <crichton@gimp.org>
+ *          Federico Mena-Quintero <federico@gimp.org>
+ *          Jonathan Blandford <jrb@redhat.com>
+ *          Søren Sandmann <sandmann@daimi.au.dk>
  *
  * 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.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Cambridge, MA 02139, USA.
+ * Lesser General Public License for more details.
  *
+ * 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.
  */
 
 /* Following code (almost) blatantly ripped from Imlib */
 
 #include <config.h>
-#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <glib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <tiffio.h>
+#include <errno.h>
+#include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-io.h"
+
+#ifdef G_OS_WIN32
+#include <fcntl.h>
+#include <io.h>
+#define lseek(a,b,c) _lseek(a,b,c)
+#define O_RDWR _O_RDWR
+#endif
+\f
+
+typedef struct _TiffContext TiffContext;
+struct _TiffContext
+{
+       GdkPixbufModuleSizeFunc size_func;
+       GdkPixbufModulePreparedFunc prepare_func;
+       GdkPixbufModuleUpdatedFunc update_func;
+       gpointer user_data;
+        
+        guchar *buffer;
+        guint allocated;
+        guint used;
+        guint pos;
+};
+
+\f
+
+static char *global_error = NULL;
+static TIFFErrorHandler orig_error_handler = NULL;
+static TIFFErrorHandler orig_warning_handler = NULL;
+
+static void
+tiff_warning_handler (const char *mod, const char *fmt, va_list ap)
+{
+        /* Don't print anything; we should not be dumping junk to
+         * stderr, since that may be bad for some apps.
+         */
 
-#include "gdk-pixbuf.h"
-/*#include "gdk-pixbuf-io.h" */
+        /* libTIFF seems to occasionally warn about things that
+         * are really errors, so maybe we should just call tiff_error_handler
+         * here.
+         */
+}
 
-GdkPixBuf *image_load(FILE * f)
+static void
+tiff_error_handler (const char *mod, const char *fmt, va_list ap)
 {
-    GdkPixBuf *pixbuf;
-    TIFF *tiff;
-    art_u8 *pixels, *tmppix;
-    gint w, h, x, y, num_pixs, fd;
-    uint32 *rast, *tmp_rast;
+        if (global_error) {                
+                /* Blah, loader called us twice */
+                return;
+        }
 
-    g_return_val_if_fail(f != NULL, NULL);
+        global_error = g_strdup_vprintf (fmt, ap);
+}
 
-    fd = fileno(f);
-    tiff = TIFFFdOpen(fd, "libpixbuf-tiff", "r");
+static void
+tiff_push_handlers (void)
+{
+        if (global_error)
+                g_warning ("TIFF loader left crufty global_error around, FIXME");
+        
+        orig_error_handler = TIFFSetErrorHandler (tiff_error_handler);
+        orig_warning_handler = TIFFSetWarningHandler (tiff_warning_handler);
+}
 
-    if (!tiff)
-       return NULL;
+static void
+tiff_pop_handlers (void)
+{
+        if (global_error)
+                g_warning ("TIFF loader left crufty global_error around, FIXME");
+        
+        TIFFSetErrorHandler (orig_error_handler);
+        TIFFSetWarningHandler (orig_warning_handler);
+}
 
-    TIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &w);
-    TIFFGetField(tiff, TIFFTAG_IMAGELENGTH, &h);
-    num_pixs = w * h;
+static void
+tiff_set_error (GError    **error,
+                int         error_code,
+                const char *msg)
+{
+        /* Take the error message from libtiff and merge it with
+         * some context we provide.
+         */
+        if (global_error) {
+                g_set_error (error,
+                             GDK_PIXBUF_ERROR,
+                             error_code,
+                             "%s%s%s", msg, ": ", global_error);
 
-    /* Yes, it needs to be _TIFFMalloc... */
-    rast = (uint32 *) _TIFFmalloc(num_pixs * sizeof(uint32));
+                g_free (global_error);
+                global_error = NULL;
+        }
+        else {
+                g_set_error (error,
+                             GDK_PIXBUF_ERROR,
+                             error_code, msg);
+        }
+}
 
-    if (!rast) {
-       TIFFClose(tiff);
-       return NULL;
-    }
+\f
 
-    if (TIFFReadRGBAImage(tiff, w, h, rast, 0)) {
-       pixels = art_alloc(num_pixs * 4);
-       if (!pixels) {
-           _TIFFfree(rast);
-           TIFFClose(tiff);
-           return NULL;
+static void free_buffer (guchar *pixels, gpointer data)
+{
+       g_free (pixels);
+}
+
+#if TIFFLIB_VERSION >= 20031226
+static gboolean tifflibversion (int *major, int *minor, int *revision)
+{
+        if (sscanf (TIFFGetVersion(), 
+                    "LIBTIFF, Version %d.%d.%d", 
+                    major, minor, revision) < 3)
+                return FALSE;
+
+        return TRUE;
+}
+#endif
+
+static GdkPixbuf *
+tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
+{
+       guchar *pixels = NULL;
+       gint width, height, rowstride, bytes;
+       GdkPixbuf *pixbuf;
+#if TIFFLIB_VERSION >= 20031226
+        gint major, minor, revision;
+#endif
+
+        /* We're called with the lock held. */
+        
+        g_return_val_if_fail (global_error == NULL, NULL);
+
+       if (!TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &width) || global_error) {
+                tiff_set_error (error,
+                                GDK_PIXBUF_ERROR_FAILED,
+                                _("Could not get image width (bad TIFF file)"));
+                return NULL;
+        }
+        
+        if (!TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &height) || global_error) {
+                tiff_set_error (error,
+                                GDK_PIXBUF_ERROR_FAILED,
+                                _("Could not get image height (bad TIFF file)"));
+                return NULL;
+        }
+
+        if (width <= 0 || height <= 0) {
+                g_set_error (error,
+                             GDK_PIXBUF_ERROR,
+                             GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                             _("Width or height of TIFF image is zero"));
+                return NULL;                
+        }
+        
+        rowstride = width * 4;
+        if (rowstride / 4 != width) { /* overflow */
+                g_set_error (error,
+                             GDK_PIXBUF_ERROR,
+                             GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                             _("Dimensions of TIFF image too large"));
+                return NULL;                
+        }
+        
+        bytes = height * rowstride;
+        if (bytes / rowstride != height) { /* overflow */
+                g_set_error (error,
+                             GDK_PIXBUF_ERROR,
+                             GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                             _("Dimensions of TIFF image too large"));
+                return NULL;                
+        }
+
+       if (context && context->size_func) {
+                gint w = width;
+                gint h = height;
+               (* context->size_func) (&w, &h, context->user_data);
+                
+                if (w == 0 || h == 0)
+                    return NULL;
+        }
+
+        pixels = g_try_malloc (bytes);
+
+        if (!pixels) {
+                g_set_error (error,
+                             GDK_PIXBUF_ERROR,
+                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                             _("Insufficient memory to open TIFF file"));
+                return NULL;
+        }
+
+       pixbuf = gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, TRUE, 8, 
+                                           width, height, rowstride,
+                                           free_buffer, NULL);
+        if (!pixbuf) {
+                g_free (pixels);
+                g_set_error (error,
+                             GDK_PIXBUF_ERROR,
+                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                             _("Insufficient memory to open TIFF file"));
+                return NULL;
+        }
+
+       if (context && context->prepare_func)
+               (* context->prepare_func) (pixbuf, NULL, context->user_data);
+
+#if TIFFLIB_VERSION >= 20031226
+        if (tifflibversion(&major, &minor, &revision) && major == 3 &&
+            (minor > 6 || (minor == 6 && revision > 0))) {                
+                if (!TIFFReadRGBAImageOriented (tiff, width, height, (uint32 *)pixels, ORIENTATION_TOPLEFT, 1) || global_error) 
+                {
+                        tiff_set_error (error,
+                                        GDK_PIXBUF_ERROR_FAILED,
+                                        _("Failed to load RGB data from TIFF file"));
+                        g_object_unref (pixbuf);
+                        return NULL;
+                }
+
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+                /* Turns out that the packing used by TIFFRGBAImage depends on 
+                 * the host byte order... 
+                 */ 
+                while (pixels < pixbuf->pixels + bytes) {
+                        uint32 pixel = *(uint32 *)pixels;
+                        int r = TIFFGetR(pixel);
+                        int g = TIFFGetG(pixel);
+                        int b = TIFFGetB(pixel);
+                        int a = TIFFGetA(pixel);
+                        *pixels++ = r;
+                        *pixels++ = g;
+                        *pixels++ = b;
+                        *pixels++ = a;
+                }
+#endif
+        }
+        else 
+#endif
+              {
+                uint32 *rast, *tmp_rast;
+                gint x, y;
+                guchar *tmppix;
+
+                /* Yes, it needs to be _TIFFMalloc... */
+                rast = (uint32 *) _TIFFmalloc (width * height * sizeof (uint32));
+                if (!rast) {
+                        g_set_error (error,
+                                     GDK_PIXBUF_ERROR,
+                                     GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                                     _("Insufficient memory to open TIFF file"));
+                        g_object_unref (pixbuf);
+                        
+                        return NULL;
+                }
+                if (!TIFFReadRGBAImage (tiff, width, height, rast, 1) || global_error) {
+                        tiff_set_error (error,
+                                        GDK_PIXBUF_ERROR_FAILED,
+                                        _("Failed to load RGB data from TIFF file"));
+                        g_object_unref (pixbuf);
+                        _TIFFfree (rast);
+                        
+                        return NULL;
+                }
+                
+                pixels = gdk_pixbuf_get_pixels (pixbuf);
+                
+                g_assert (pixels);
+                
+                tmppix = pixels;
+                
+                for (y = 0; y < height; y++) {
+                        /* Unexplainable...are tiffs backwards? */
+                        /* Also looking at the GIMP plugin, this
+                         * whole reading thing can be a bit more
+                         * robust.
+                         */
+                        tmp_rast = rast + ((height - y - 1) * width);
+                        for (x = 0; x < width; x++) {
+                                tmppix[0] = TIFFGetR (*tmp_rast);
+                                tmppix[1] = TIFFGetG (*tmp_rast);
+                                tmppix[2] = TIFFGetB (*tmp_rast);
+                                tmppix[3] = TIFFGetA (*tmp_rast);
+                                tmp_rast++;
+                                tmppix += 4;
+                        }
+                }
+                
+                _TIFFfree (rast);
+             }
+
+       if (context && context->update_func)
+               (* context->update_func) (pixbuf, 0, 0, width, height, context->user_data);
+        
+        return pixbuf;
+}
+
+\f
+
+/* Static loader */
+
+static GdkPixbuf *
+gdk_pixbuf__tiff_image_load (FILE *f, GError **error)
+{
+        TIFF *tiff;
+        int fd;
+        GdkPixbuf *pixbuf;
+        
+        g_return_val_if_fail (f != NULL, NULL);
+
+        tiff_push_handlers ();
+        
+        fd = fileno (f);
+
+        /* On OSF, apparently fseek() works in some on-demand way, so
+         * the fseek gdk_pixbuf_new_from_file() doesn't work here
+         * since we are using the raw file descriptor. So, we call lseek() on the fd
+         * before using it. (#60840)
+         */
+        lseek (fd, 0, SEEK_SET);
+        tiff = TIFFFdOpen (fd, "libpixbuf-tiff", "r");
+        
+        if (!tiff || global_error) {
+                tiff_set_error (error,
+                                GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                                _("Failed to open TIFF image"));
+                tiff_pop_handlers ();
+
+                return NULL;
+        }
+
+        pixbuf = tiff_image_parse (tiff, NULL, error);
+        
+        TIFFClose (tiff);
+        if (global_error) {
+                tiff_set_error (error,
+                                GDK_PIXBUF_ERROR_FAILED,
+                                _("TIFFClose operation failed"));
+        }
+        
+        tiff_pop_handlers ();
+
+        return pixbuf;
+}
+
+\f
+
+/* Progressive loader */
+
+static gpointer
+gdk_pixbuf__tiff_image_begin_load (GdkPixbufModuleSizeFunc size_func,
+                                   GdkPixbufModulePreparedFunc prepare_func,
+                                  GdkPixbufModuleUpdatedFunc update_func,
+                                  gpointer user_data,
+                                   GError **error)
+{
+       TiffContext *context;
+        
+       context = g_new0 (TiffContext, 1);
+       context->size_func = size_func;
+       context->prepare_func = prepare_func;
+       context->update_func = update_func;
+       context->user_data = user_data;
+        context->buffer = NULL;
+        context->allocated = 0;
+        context->used = 0;
+        context->pos = 0;
+        
+       return context;
+}
+
+static tsize_t
+tiff_load_read (thandle_t handle, tdata_t buf, tsize_t size)
+{
+        TiffContext *context = (TiffContext *)handle;
+        
+        if (context->pos + size > context->used)
+                return 0;
+        
+        memcpy (buf, context->buffer + context->pos, size);
+        context->pos += size;
+        return size;
+}
+
+static tsize_t
+tiff_load_write (thandle_t handle, tdata_t buf, tsize_t size)
+{
+        return -1;
+}
+
+static toff_t
+tiff_load_seek (thandle_t handle, toff_t offset, int whence)
+{
+        TiffContext *context = (TiffContext *)handle;
+        
+        switch (whence) {
+        case SEEK_SET:
+                if (offset > context->used)
+                        return -1;
+                context->pos = offset;
+                break;
+        case SEEK_CUR:
+                if (offset + context->pos >= context->used)
+                        return -1;
+                context->pos += offset;
+                break;
+        case SEEK_END:
+                if (offset + context->used > context->used)
+                        return -1;
+                context->pos = context->used + offset;
+                break;
+        default:
+                return -1;
+        }
+        return context->pos;
+}
+
+static int
+tiff_load_close (thandle_t context)
+{
+        return 0;
+}
+
+static toff_t
+tiff_load_size (thandle_t handle)
+{
+        TiffContext *context = (TiffContext *)handle;
+        
+        return context->used;
+}
+
+static int
+tiff_load_map_file (thandle_t handle, tdata_t *buf, toff_t *size)
+{
+        TiffContext *context = (TiffContext *)handle;
+        
+        *buf = context->buffer;
+        *size = context->used;
+        
+        return 0;
+}
+
+static void
+tiff_load_unmap_file (thandle_t handle, tdata_t data, toff_t offset)
+{
+}
+
+static gboolean
+gdk_pixbuf__tiff_image_stop_load (gpointer data,
+                                  GError **error)
+{
+        TiffContext *context = data;
+        TIFF *tiff;
+        gboolean retval;
+        
+        g_return_val_if_fail (data != NULL, FALSE);
+
+        tiff_push_handlers ();
+        
+        tiff = TIFFClientOpen ("libtiff-pixbuf", "r", data, 
+                               tiff_load_read, tiff_load_write, 
+                               tiff_load_seek, tiff_load_close, 
+                               tiff_load_size, 
+                               tiff_load_map_file, tiff_load_unmap_file);
+        if (!tiff || global_error) {
+                tiff_set_error (error,
+                                GDK_PIXBUF_ERROR_FAILED,
+                                _("Failed to load TIFF image"));
+                retval = FALSE;
+        } else {
+                GdkPixbuf *pixbuf;
+                
+                pixbuf = tiff_image_parse (tiff, context, error);
+                if (pixbuf)
+                        g_object_unref (pixbuf);
+                retval = pixbuf != NULL;
+                if (global_error)
+                        {
+                                tiff_set_error (error,
+                                                GDK_PIXBUF_ERROR_FAILED,
+                                                _("Failed to load TIFF image"));
+                                tiff_pop_handlers ();
+
+                                retval = FALSE;
+                        }
+        }
+
+        if (tiff)
+                TIFFClose (tiff);
+
+        g_assert (!global_error);
+        
+        g_free (context->buffer);
+        g_free (context);
+
+        tiff_pop_handlers ();
+
+        return retval;
+}
+
+static gboolean
+make_available_at_least (TiffContext *context, guint needed)
+{
+        guchar *new_buffer = NULL;
+        guint need_alloc;
+        
+        need_alloc = context->used + needed;
+        if (need_alloc > context->allocated) {
+                guint new_size = 1;
+                while (new_size < need_alloc)
+                        new_size *= 2;
+                
+                new_buffer = g_try_realloc (context->buffer, new_size);
+                if (new_buffer) {
+                        context->buffer = new_buffer;
+                        context->allocated = new_size;
+                        return TRUE;
+                }
+                return FALSE;
+        }
+        return TRUE;
+}
+
+static gboolean
+gdk_pixbuf__tiff_image_load_increment (gpointer data, const guchar *buf,
+                                       guint size, GError **error)
+{
+       TiffContext *context = (TiffContext *) data;
+        
+       g_return_val_if_fail (data != NULL, FALSE);
+        
+        if (!make_available_at_least (context, size)) {
+                g_set_error (error,
+                             GDK_PIXBUF_ERROR,
+                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                             _("Insufficient memory to open TIFF file"));
+                return FALSE;
+        }
+        
+        memcpy (context->buffer + context->used, buf, size);
+        context->used += size;
+       return TRUE;
+}
+
+typedef struct {
+        gchar *buffer;
+        guint allocated;
+        guint used;
+        guint pos;
+} TiffSaveContext;
+
+static tsize_t
+tiff_save_read (thandle_t handle, tdata_t buf, tsize_t size)
+{
+        return -1;
+}
+
+static tsize_t
+tiff_save_write (thandle_t handle, tdata_t buf, tsize_t size)
+{
+        TiffSaveContext *context = (TiffSaveContext *)handle;
+
+        /* Modify buffer length */
+        if (context->pos + size > context->used)
+                context->used = context->pos + size;
+
+        /* Realloc */
+        if (context->used > context->allocated) {
+                context->buffer = g_realloc (context->buffer, context->pos + size);
+                context->allocated = context->used;
+        }
+
+        /* Now copy the data */
+        memcpy (context->buffer + context->pos, buf, size);
+
+        /* Update pos */
+        context->pos += size;
+
+        return size;
+}
+
+static toff_t
+tiff_save_seek (thandle_t handle, toff_t offset, int whence)
+{
+        TiffSaveContext *context = (TiffSaveContext *)handle;
+
+        switch (whence) {
+        case SEEK_SET:
+                context->pos = offset;
+                break;
+        case SEEK_CUR:
+                context->pos += offset;
+                break;
+        case SEEK_END:
+                context->pos = context->used + offset;
+                break;
+        default:
+                return -1;
+        }
+        return context->pos;
+}
+
+static int
+tiff_save_close (thandle_t context)
+{
+        return 0;
+}
+
+static toff_t
+tiff_save_size (thandle_t handle)
+{
+        return -1;
+}
+
+static TiffSaveContext *
+create_save_context (void)
+{
+        TiffSaveContext *context;
+
+        context = g_new (TiffSaveContext, 1);
+        context->buffer = NULL;
+        context->allocated = 0;
+        context->used = 0;
+        context->pos = 0;
+
+        return context;
+}
+
+static void
+free_save_context (TiffSaveContext *context)
+{
+        g_free (context->buffer);
+        g_free (context);
+}
+
+static gboolean
+gdk_pixbuf__tiff_image_save_to_callback (GdkPixbufSaveFunc   save_func,
+                                         gpointer            user_data,
+                                         GdkPixbuf          *pixbuf, 
+                                         gchar             **keys,
+                                         gchar             **values,
+                                         GError            **error)
+{
+        TIFF *tiff;
+        gint width, height, rowstride;
+        guchar *pixels;
+        gboolean has_alpha;
+        gushort alpha_samples[1] = { EXTRASAMPLE_UNASSALPHA };
+        int y;
+        TiffSaveContext *context;
+        gboolean retval;
+
+        tiff_push_handlers ();
+
+        context = create_save_context ();
+        tiff = TIFFClientOpen ("libtiff-pixbuf", "w", context,  
+                               tiff_save_read, tiff_save_write, 
+                               tiff_save_seek, tiff_save_close, 
+                               tiff_save_size, 
+                               NULL, NULL);
+
+        if (!tiff || global_error) {
+                tiff_set_error (error,
+                                GDK_PIXBUF_ERROR_FAILED,
+                                _("Failed to save TIFF image"));
+
+                tiff_pop_handlers ();
+
+                free_save_context (context);
+                return FALSE;
+        }
+
+        rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+        pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+        has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
+
+        height = gdk_pixbuf_get_height (pixbuf);
+        width = gdk_pixbuf_get_width (pixbuf);
+
+        TIFFSetField (tiff, TIFFTAG_IMAGEWIDTH, width);
+        TIFFSetField (tiff, TIFFTAG_IMAGELENGTH, height);
+        TIFFSetField (tiff, TIFFTAG_BITSPERSAMPLE, 8);
+        TIFFSetField (tiff, TIFFTAG_SAMPLESPERPIXEL, has_alpha ? 4 : 3);
+        TIFFSetField (tiff, TIFFTAG_ROWSPERSTRIP, height);
+
+        if (has_alpha)
+                TIFFSetField (tiff, TIFFTAG_EXTRASAMPLES, 1, alpha_samples);
+
+        TIFFSetField (tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
+        TIFFSetField (tiff, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);        
+        TIFFSetField (tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+
+        for (y = 0; y < height; y++) {
+                if (TIFFWriteScanline (tiff, pixels + y * rowstride, y, 0) == -1 ||
+                    global_error)
+                        break;
+        }
+
+        if (global_error) {
+                tiff_set_error (error,
+                                GDK_PIXBUF_ERROR_FAILED,
+                                _("Failed to write TIFF data"));
+
+                TIFFClose (tiff);
+
+                free_save_context (context);               
+                tiff_pop_handlers ();
+                
+                return FALSE;
+        }
+
+        TIFFClose (tiff);
+        if (global_error) {
+                tiff_set_error (error,
+                                GDK_PIXBUF_ERROR_FAILED,
+                                _("TIFFClose operation failed"));
+
+                free_save_context (context);               
+                tiff_pop_handlers ();
+                
+                return FALSE;
+        }
+
+        tiff_pop_handlers ();
+
+        /* Now call the callback */
+        retval = save_func (context->buffer, context->used, error, user_data);
+
+        free_save_context (context);               
+        
+        return retval;
+}
+
+static gboolean
+save_to_file_cb (const gchar *buf,
+                gsize count,
+                GError **error,
+                gpointer data)
+{
+       gint bytes;
+       
+       while (count > 0) {
+               bytes = fwrite (buf, sizeof (gchar), count, (FILE *) data);
+               if (bytes <= 0)
+                       break;
+               count -= bytes;
+               buf += bytes;
        }
-       tmppix = pixels;
-
-       for (y = 0; y < h; y++) {
-           /* Unexplainable...are tiffs backwards? */
-           /* Also looking at the GIMP plugin, this
-            * whole reading thing can be a bit more
-            * robust.
-            */
-           tmp_rast = rast + ((h - y - 1) * w);
-           for (x = 0; x < w; x++) {
-               tmppix[0] = TIFFGetR(*tmp_rast);
-               tmppix[1] = TIFFGetG(*tmp_rast);
-               tmppix[2] = TIFFGetB(*tmp_rast);
-               tmppix[3] = TIFFGetA(*tmp_rast);
-               tmp_rast++;
-               tmppix += 4;
-           }
+
+       if (count) {
+               g_set_error (error,
+                            GDK_PIXBUF_ERROR,
+                            GDK_PIXBUF_ERROR_FAILED,
+                            _("Couldn't write to TIFF file"));
+               return FALSE;
        }
-    }
-    _TIFFfree(rast);
-    TIFFClose(tiff);
+       
+       return TRUE;
+}
 
-    /* Return the GdkPixBuf */
-    pixbuf = g_new(GdkPixBuf, 1);
-    pixbuf->art_pixbuf = art_pixbuf_new_rgba(pixels, w, h, (w * 4));
+static gboolean
+gdk_pixbuf__tiff_image_save (FILE          *f, 
+                             GdkPixbuf     *pixbuf, 
+                             gchar        **keys,
+                             gchar        **values,
+                             GError       **error)
+{
+       return gdk_pixbuf__tiff_image_save_to_callback (save_to_file_cb,
+                                                        f, pixbuf, keys,
+                                                        values, error);
+}
 
-    /* Ok, I'm anal...shoot me */
-    if (!(pixbuf->art_pixbuf))
-       return NULL;
-    pixbuf->ref_count = 0;
-    pixbuf->unref_func = NULL;
+void
+MODULE_ENTRY (tiff, fill_vtable) (GdkPixbufModule *module)
+{
+        module->load = gdk_pixbuf__tiff_image_load;
+        module->begin_load = gdk_pixbuf__tiff_image_begin_load;
+        module->stop_load = gdk_pixbuf__tiff_image_stop_load;
+        module->load_increment = gdk_pixbuf__tiff_image_load_increment;
+        module->save = gdk_pixbuf__tiff_image_save;
+        module->save_to_callback = gdk_pixbuf__tiff_image_save_to_callback;
+}
+
+void
+MODULE_ENTRY (tiff, fill_info) (GdkPixbufFormat *info)
+{
+        static GdkPixbufModulePattern signature[] = {
+                { "MM \x2a", "  z ", 100 },
+                { "II\x2a ", "   z", 100 },
+                { NULL, NULL, 0 }
+        };
+       static gchar * mime_types[] = {
+               "image/tiff",
+               NULL
+       };
+       static gchar * extensions[] = {
+               "tiff",
+               "tif",
+               NULL
+       };
 
-    return pixbuf;
+       info->name = "tiff";
+        info->signature = signature;
+       info->description = N_("The TIFF image format");
+       info->mime_types = mime_types;
+       info->extensions = extensions;
+        /* not threadsafe, due to the error handler handling */
+       info->flags = GDK_PIXBUF_FORMAT_WRITABLE;
+       info->license = "LGPL";
 }