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

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.
This commit is contained in:
Michael Natterer 2016-05-03 23:57:04 +02:00
parent 2359c29895
commit 08b67de9bf
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/core/gimpimage-color-profile.c
View File

@ -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)
{