dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #6109 for saving color profile on each tiff layer

This commit is contained in:
Shaylin Chetty 2020-12-22 15:47:08 +02:00 committed by Jacob Boerema
parent 478193fbcd
commit 2dd61d4613
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plug-ins/file-tiff/file-tiff-save.c
View File

@ -321,11 +321,13 @@ save_layer (TIFF *tif,
gint config_compression; gint config_compression;
gboolean config_save_transp_pixels; gboolean config_save_transp_pixels;
gboolean config_save_geotiff_tags; gboolean config_save_geotiff_tags;
gboolean config_save_profile;
g_object_get (config, g_object_get (config,
"compression", &config_compression, "compression", &config_compression,
"save-transparent-pixels", &config_save_transp_pixels, "save-transparent-pixels", &config_save_transp_pixels,
"save-geotiff", &config_save_geotiff_tags, "save-geotiff", &config_save_geotiff_tags,
"save-color-profile", &config_save_profile,
NULL); NULL);
compression = gimp_compression_to_tiff_compression (config_compression); compression = gimp_compression_to_tiff_compression (config_compression);
@ -633,6 +635,22 @@ save_layer (TIFF *tif,
} }
} }
#ifdef TIFFTAG_ICCPROFILE
if (config_save_profile)
{
const guint8 *icc_data;
gsize icc_length;
GimpColorProfile *profile;
profile = gimp_image_get_effective_color_profile (orig_image);
/* Write the profile to the TIFF file. */
icc_data = gimp_color_profile_get_icc_profile (profile, &icc_length);
TIFFSetField (tif, TIFFTAG_ICCPROFILE, icc_length, icc_data);
g_object_unref (profile);
}
#endif
/* Set TIFF parameters. */ /* Set TIFF parameters. */
if (num_pages > 1) if (num_pages > 1)
@ -1087,12 +1105,9 @@ save_image (GFile *file,
TIFFSetField (tif, TIFFTAG_IMAGEDESCRIPTION, config_comment); TIFFSetField (tif, TIFFTAG_IMAGEDESCRIPTION, config_comment);
} }
#ifdef TIFFTAG_ICCPROFILE
if (config_save_profile) if (config_save_profile)
{ {
GimpColorProfile *profile; GimpColorProfile *profile;
const guint8 *icc_data;
gsize icc_length;
GError *error = NULL; GError *error = NULL;
profile = gimp_image_get_effective_color_profile (orig_image); profile = gimp_image_get_effective_color_profile (orig_image);
@ -1103,10 +1118,6 @@ save_image (GFile *file,
*/ */
out_linear = (gimp_color_profile_is_linear (profile)); out_linear = (gimp_color_profile_is_linear (profile));
/* Write the profile to the TIFF file. */
icc_data = gimp_color_profile_get_icc_profile (profile, &icc_length);
TIFFSetField (tif, TIFFTAG_ICCPROFILE, icc_length, icc_data);
space = gimp_color_profile_get_space (profile, space = gimp_color_profile_get_space (profile,
GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC, GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
&error); &error);
@ -1121,7 +1132,6 @@ save_image (GFile *file,
g_object_unref (profile); g_object_unref (profile);
} }
#endif
/* we put the whole file's thumbnail into the first IFD (i.e., page) */ /* we put the whole file's thumbnail into the first IFD (i.e., page) */
if (config_save_thumbnail) if (config_save_thumbnail)