* Authors: Mark Crichton <crichton@gimp.org>
* Federico Mena-Quintero <federico@gimp.org>
* Jonathan Blandford <jrb@redhat.com>
- * Søren Sandmann <sandmann@daimi.au.dk>
+ * 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 Lesser General Public
/* Following code (almost) blatantly ripped from Imlib */
-#include <config.h>
+#include "config.h"
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
global_error = NULL;
}
else {
- g_set_error (error,
- GDK_PIXBUF_ERROR,
- error_code, msg);
+ g_set_error_literal (error,
+ GDK_PIXBUF_ERROR,
+ error_code, msg);
}
}
GdkPixbuf *pixbuf;
uint16 orientation = 0;
uint16 transform = 0;
+ uint16 codec;
+ gchar *icc_profile_base64;
+ const gchar *icc_profile;
+ guint icc_profile_size;
+ gint retval;
/* We're called with the lock held. */
}
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"));
+ g_set_error_literal (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"));
+ g_set_error_literal (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"));
+ g_set_error_literal (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+ _("Dimensions of TIFF image too large"));
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"));
+ g_set_error_literal (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+ _("Insufficient memory to open TIFF file"));
return NULL;
}
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"));
+ g_set_error_literal (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+ _("Insufficient memory to open TIFF file"));
return NULL;
}
gdk_pixbuf_set_option (pixbuf, "orientation", str);
}
+ TIFFGetField (tiff, TIFFTAG_COMPRESSION, &codec);
+ if (codec > 0) {
+ gchar str[5];
+ g_snprintf (str, sizeof (str), "%d", codec);
+ gdk_pixbuf_set_option (pixbuf, "compression", str);
+ }
+
+ /* Extract embedded ICC profile */
+ retval = TIFFGetField (tiff, TIFFTAG_ICCPROFILE, &icc_profile_size, &icc_profile);
+ if (retval == 1) {
+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
+ gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64);
+ g_free (icc_profile_base64);
+ }
+
if (context && context->prepare_func)
(* context->prepare_func) (pixbuf, NULL, context->user_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"));
+ g_set_error_literal (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+ _("Insufficient memory to open TIFF file"));
return FALSE;
}
int y;
TiffSaveContext *context;
gboolean retval;
+ guchar *icc_profile = NULL;
+ gsize icc_profile_size = 0;
tiff_push_handlers ();
TIFFSetField (tiff, TIFFTAG_SAMPLESPERPIXEL, has_alpha ? 4 : 3);
TIFFSetField (tiff, TIFFTAG_ROWSPERSTRIP, height);
+ /* libtiff supports a number of 'codecs' such as:
+ 1 None, 2 Huffman, 5 LZW, 7 JPEG, 8 Deflate, see tiff.h */
+ if (keys && *keys && values && *values) {
+ guint i = 0;
+
+ while (keys[i]) {
+ if (g_str_equal (keys[i], "compression")) {
+ guint16 codec = strtol (values[i], NULL, 0);
+ if (TIFFIsCODECConfigured (codec))
+ TIFFSetField (tiff, TIFFTAG_COMPRESSION, codec);
+ else {
+ tiff_set_error (error,
+ GDK_PIXBUF_ERROR_FAILED,
+ _("TIFF compression doesn't refer to a valid codec."));
+ retval = FALSE;
+ goto cleanup;
+ }
+ } else if (g_str_equal (keys[i], "icc-profile")) {
+ /* decode from base64 */
+ icc_profile = g_base64_decode (values[i], &icc_profile_size);
+ if (icc_profile_size < 127) {
+ g_set_error (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_BAD_OPTION,
+ _("Color profile has invalid length %d."),
+ (gint)icc_profile_size);
+ retval = FALSE;
+ goto cleanup;
+ }
+ }
+ i++;
+ }
+ }
+
if (has_alpha)
TIFFSetField (tiff, TIFFTAG_EXTRASAMPLES, 1, alpha_samples);
TIFFSetField (tiff, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);
TIFFSetField (tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+ if (icc_profile != NULL)
+ TIFFSetField (tiff, TIFFTAG_ICCPROFILE, icc_profile_size, icc_profile);
+
for (y = 0; y < height; y++) {
if (TIFFWriteScanline (tiff, pixels + y * rowstride, y, 0) == -1 ||
global_error)
_("Failed to write TIFF data"));
TIFFClose (tiff);
-
- free_save_context (context);
- tiff_pop_handlers ();
-
- return FALSE;
+ retval = FALSE;
+ goto cleanup;
}
TIFFClose (tiff);
tiff_set_error (error,
GDK_PIXBUF_ERROR_FAILED,
_("TIFFClose operation failed"));
-
- free_save_context (context);
- tiff_pop_handlers ();
-
- return FALSE;
+ retval = FALSE;
+ goto cleanup;
}
- tiff_pop_handlers ();
/* Now call the callback */
retval = save_func (context->buffer, context->used, error, user_data);
- free_save_context (context);
-
+cleanup:
+ g_free (icc_profile);
+ tiff_pop_handlers ();
+ free_save_context (context);
return retval;
}
}
if (count) {
- g_set_error (error,
- GDK_PIXBUF_ERROR,
- GDK_PIXBUF_ERROR_FAILED,
- _("Couldn't write to TIFF file"));
+ g_set_error_literal (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_FAILED,
+ _("Couldn't write to TIFF file"));
return FALSE;
}
static GdkPixbufModulePattern signature[] = {
{ "MM \x2a", " z ", 100 },
{ "II\x2a ", " z", 100 },
+ { "II* \020 CR\002 ", " z zzz z", 0 },
{ NULL, NULL, 0 }
};
static gchar * mime_types[] = {