[gimp] app: add gimp_image_get_builtin_color_profile()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: add gimp_image_get_builtin_color_profile()
- Date: Sun, 2 Aug 2015 21:29:11 +0000 (UTC)
commit cac04aed78b7ea1eccba5a1eec3cb564c568bf6b
Author: Michael Natterer <mitch gimp org>
Date: Sun Aug 2 23:24:12 2015 +0200
app: add gimp_image_get_builtin_color_profile()
which returns a color profile for the image as if nothing was
configured, currently either the builtin srgb or linear_rgb profile.
app/core/gimpimage-color-profile.c | 23 ++++++++++++++++-------
app/core/gimpimage-color-profile.h | 3 +++
app/core/gimpimage.c | 9 +--------
3 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/app/core/gimpimage-color-profile.c b/app/core/gimpimage-color-profile.c
index c3fce02..c5b9aac 100644
--- a/app/core/gimpimage-color-profile.c
+++ b/app/core/gimpimage-color-profile.c
@@ -281,6 +281,21 @@ gimp_image_set_color_profile (GimpImage *image,
return gimp_image_set_icc_profile (image, data, length, error);
}
+GimpColorProfile *
+gimp_image_get_builtin_color_profile (GimpImage *image)
+{
+ const Babl *format;
+
+ g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+ format = gimp_image_get_layer_format (image, FALSE);
+
+ if (gimp_babl_format_get_linear (format))
+ return gimp_color_profile_new_linear_rgb ();
+ else
+ return gimp_color_profile_new_srgb ();
+}
+
gboolean
gimp_image_convert_color_profile (GimpImage *image,
GimpColorProfile *dest_profile,
@@ -291,7 +306,6 @@ gimp_image_convert_color_profile (GimpImage *image,
{
GimpColorProfile *src_profile;
GimpColorProfile *builtin_profile;
- const Babl *layer_format;
g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
g_return_val_if_fail (dest_profile != NULL, FALSE);
@@ -318,12 +332,7 @@ gimp_image_convert_color_profile (GimpImage *image,
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CONVERT,
_("Color profile conversion"));
- layer_format = gimp_image_get_layer_format (image, FALSE);
-
- if (gimp_babl_format_get_linear (layer_format))
- builtin_profile = gimp_color_profile_new_linear_rgb ();
- else
- builtin_profile = gimp_color_profile_new_srgb ();
+ builtin_profile = gimp_image_get_builtin_color_profile (image);
if (gimp_color_profile_is_equal (dest_profile, builtin_profile))
{
diff --git a/app/core/gimpimage-color-profile.h b/app/core/gimpimage-color-profile.h
index 36be7f8..3ead665 100644
--- a/app/core/gimpimage-color-profile.h
+++ b/app/core/gimpimage-color-profile.h
@@ -51,6 +51,9 @@ gboolean gimp_image_set_color_profile (GimpImage *ima
GimpColorProfile *profile,
GError **error);
+GimpColorProfile * gimp_image_get_builtin_color_profile
+ (GimpImage *image);
+
gboolean gimp_image_convert_color_profile (GimpImage *image,
GimpColorProfile *dest_profile,
GimpColorRenderingIntent intent,
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index ca31876..59ff32e 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -1385,14 +1385,7 @@ gimp_image_color_managed_get_color_profile (GimpColorManaged *managed)
}
if (! profile)
- {
- const Babl *format = gimp_image_get_layer_format (image, FALSE);
-
- if (gimp_babl_format_get_linear (format))
- profile = gimp_color_profile_new_linear_rgb ();
- else
- profile = gimp_color_profile_new_srgb ();
- }
+ profile = gimp_image_get_builtin_color_profile (image);
return profile;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]