modules, libgimpwidgets: use gimp_color_managed_get_color_profile()

which always returns a profile, instead of code that uses the ICC
blob and falls back to GimpColorConfig's profile, then falls back
to the built-in profiles.
This commit is contained in:
Michael Natterer
2015-05-27 12:53:46 +02:00
parent 8b824305a0
commit d3e11c5b2c
2 changed files with 9 additions and 65 deletions

View File

@ -459,31 +459,6 @@ gimp_widget_get_color_profile (GtkWidget *widget)
return profile;
}
static GimpColorProfile
get_rgb_profile (GimpColorManaged *managed,
GimpColorConfig *config)
{
GimpColorProfile profile = NULL;
const guint8 *data;
gsize len;
data = gimp_color_managed_get_icc_profile (managed, &len);
if (data)
profile = gimp_lcms_profile_open_from_data (data, len, NULL);
if (profile && ! gimp_lcms_profile_is_rgb (profile))
{
gimp_lcms_profile_close (profile);
profile = NULL;
}
if (! profile)
profile = gimp_color_config_get_rgb_profile (config, NULL);
return profile;
}
static GimpColorProfile
get_display_profile (GtkWidget *widget,
GimpColorConfig *config)
@ -530,7 +505,7 @@ gimp_widget_get_color_transform (GtkWidget *widget,
/* fallthru */
case GIMP_COLOR_MANAGEMENT_DISPLAY:
src_profile = get_rgb_profile (managed, config);
src_profile = gimp_color_managed_get_color_profile (managed);
dest_profile = get_display_profile (widget, config);
break;
}