[gegl] png,jpg,tif-save: use babl_space_get_icc
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] png,jpg,tif-save: use babl_space_get_icc
- Date: Wed, 11 Jul 2018 18:42:23 +0000 (UTC)
commit c990e0753be2a2caad4a1d7de124bc0ed66af5b1
Author: Øyvind Kolås <pippin gimp org>
Date: Wed Jul 11 20:41:54 2018 +0200
png,jpg,tif-save: use babl_space_get_icc
operations/external/jpg-save.c | 8 +++-----
operations/external/png-save.c | 3 +--
operations/external/tiff-save.c | 8 +++-----
3 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/operations/external/jpg-save.c b/operations/external/jpg-save.c
index 592139711..e26c1e2a4 100644
--- a/operations/external/jpg-save.c
+++ b/operations/external/jpg-save.c
@@ -286,12 +286,10 @@ export_jpg (GeglOperation *operation,
{
int icc_len;
- const char *name = babl_get_name (space);
char *icc_profile;
- if (strlen (name) > 10) name = "babl/GEGL";
- icc_profile = babl_space_to_icc (space, name, NULL, 0, &icc_len);
- write_icc_profile (&cinfo, (void*)icc_profile, icc_len);
- free (icc_profile);
+ icc_profile = babl_space_get_icc (space, &icc_len);
+ if (icc-profile)
+ write_icc_profile (&cinfo, (void*)icc_profile, icc_len);
}
if (!grayscale)
diff --git a/operations/external/png-save.c b/operations/external/png-save.c
index 096caeecd..0ee35e200 100644
--- a/operations/external/png-save.c
+++ b/operations/external/png-save.c
@@ -161,12 +161,11 @@ export_png (GeglOperation *operation,
const char *name = babl_get_name (space);
char *icc_profile;
if (strlen (name) > 10) name = "GEGL";
- icc_profile = babl_space_to_icc (space, name, NULL, 0, &icc_len);
+ icc_profile = babl_space_get_icc (space, &icc_len);
if (icc_profile)
{
png_set_iCCP (png, info,
name, 0, (void*)icc_profile, icc_len);
- free (icc_profile);
}
}
diff --git a/operations/external/tiff-save.c b/operations/external/tiff-save.c
index c7eef8d08..eaa012f4c 100644
--- a/operations/external/tiff-save.c
+++ b/operations/external/tiff-save.c
@@ -394,12 +394,10 @@ export_tiff (GeglOperation *operation,
{
int icc_len;
- const char *name = babl_get_name (space);
char *icc_profile;
- if (strlen (name) > 10) name = "babl/GEGL";
- icc_profile = babl_space_to_icc (space, name, NULL, 0, &icc_len);
- TIFFSetField (p->tiff, TIFFTAG_ICCPROFILE, icc_len, icc_profile);
- free (icc_profile);
+ icc_profile = babl_space_get_icc (space, &icc_len);
+ if (icc_profile)
+ TIFFSetField (p->tiff, TIFFTAG_ICCPROFILE, icc_len, icc_profile);
}
if (model == babl_model_with_space("Y", space) || model == babl_model_with_space("Y'", space))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]