[gimp] app: don't disable profile import when display color management is off
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: don't disable profile import when display color management is off
- Date: Tue, 3 May 2016 21:58:55 +0000 (UTC)
commit 08b67de9bf6e338334d9cf93c6b2ae061d3ec9be
Author: Michael Natterer <mitch gimp org>
Date: Tue May 3 23:57:04 2016 +0200
app: don't disable profile import when display color management is off
It's the wrong switch, and the dialog has its own "don't ask me again"
logic.
app/core/gimpimage-color-profile.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/app/core/gimpimage-color-profile.c b/app/core/gimpimage-color-profile.c
index d99cecd..bb505e5 100644
--- a/app/core/gimpimage-color-profile.c
+++ b/app/core/gimpimage-color-profile.c
@@ -403,17 +403,10 @@ gimp_image_import_color_profile (GimpImage *image,
GimpProgress *progress,
gboolean interactive)
{
- GimpColorConfig *config;
-
g_return_if_fail (GIMP_IS_IMAGE (image));
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
- config = image->gimp->config->color_management;
-
- if (config->mode == GIMP_COLOR_MANAGEMENT_OFF)
- return;
-
if (gimp_image_get_color_profile (image))
{
GimpColorProfilePolicy policy;
@@ -445,8 +438,11 @@ gimp_image_import_color_profile (GimpImage *image,
if (policy == GIMP_COLOR_PROFILE_POLICY_CONVERT)
{
- GimpColorRenderingIntent intent;
- gboolean bpc;
+ GimpColorConfig *config;
+ GimpColorRenderingIntent intent;
+ gboolean bpc;
+
+ config = image->gimp->config->color_management;
if (! dest_profile)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]