AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Implement "compression" option in the TIFF pixbuf loader

Browse Source 
This enables applications to read out the compression of a TIFF image
and also makes it possible to apply the same or a different
compression when saving.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=584700
This commit is contained in:
Christian Dywan 2009-11-30 13:55:12 +01:00
parent 6dfdf0fadf
commit e72435f9d0
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -1902,6 +1902,10 @@ gdk_pixbuf_real_save_to_callback (GdkPixbuf *pixbuf,
* be specified using the "compression" parameter; it's value is in an * be specified using the "compression" parameter; it's value is in an
* integer in the range of [0,9]. * integer in the range of [0,9].
* *
* TIFF images recognize a "compression" option which acceps an integer value.
* Among the codecs are 1 None, 2 Huffman, 5 LZW, 7 JPEG and 8 Deflate, see
* the libtiff documentation and tiff.h for all supported codec values.
*
* ICO images can be saved in depth 16, 24, or 32, by using the "depth" * ICO images can be saved in depth 16, 24, or 32, by using the "depth"
* parameter. When the ICO saver is given "x_hot" and "y_hot" parameters, * parameter. When the ICO saver is given "x_hot" and "y_hot" parameters,
* it produces a CUR instead of an ICO. * it produces a CUR instead of an ICO.

33
gdk-pixbuf/io-tiff.c
View File

@ -149,6 +149,7 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
uint16 orientation = 0; uint16 orientation = 0;
uint16 transform = 0; uint16 transform = 0;
uint16 codec;
/* We're called with the lock held. */ /* We're called with the lock held. */
@ -266,6 +267,13 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
gdk_pixbuf_set_option (pixbuf, "orientation", str); 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);
}
if (context && context->prepare_func) if (context && context->prepare_func)
(* context->prepare_func) (pixbuf, NULL, context->user_data); (* context->prepare_func) (pixbuf, NULL, context->user_data);
@ -689,6 +697,31 @@ gdk_pixbuf__tiff_image_save_to_callback (GdkPixbufSaveFunc save_func,
TIFFSetField (tiff, TIFFTAG_SAMPLESPERPIXEL, has_alpha ? 4 : 3); TIFFSetField (tiff, TIFFTAG_SAMPLESPERPIXEL, has_alpha ? 4 : 3);
TIFFSetField (tiff, TIFFTAG_ROWSPERSTRIP, height); 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."));
tiff_pop_handlers ();
free_save_context (context);
return FALSE;
}
}
i++;
}
}
if (has_alpha) if (has_alpha)
TIFFSetField (tiff, TIFFTAG_EXTRASAMPLES, 1, alpha_samples); TIFFSetField (tiff, TIFFTAG_EXTRASAMPLES, 1, alpha_samples);