callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modules, libgimpwidgets: use gimp_color_managed_get_color_profile()

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

27
libgimpwidgets/gimpwidgetsutils.c
View File

@ -459,31 +459,6 @@ gimp_widget_get_color_profile (GtkWidget *widget)
return profile; 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 static GimpColorProfile
get_display_profile (GtkWidget *widget, get_display_profile (GtkWidget *widget,
GimpColorConfig *config) GimpColorConfig *config)
@ -530,7 +505,7 @@ gimp_widget_get_color_transform (GtkWidget *widget,
/* fallthru */ /* fallthru */
case GIMP_COLOR_MANAGEMENT_DISPLAY: 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); dest_profile = get_display_profile (widget, config);
break; break;
} }

47
modules/display-filter-lcms.c
View File

@ -83,7 +83,6 @@ static void cdisplay_lcms_convert_buffer (GimpColorDisplay *di
GeglRectangle *area); GeglRectangle *area);
static void cdisplay_lcms_changed (GimpColorDisplay *display); static void cdisplay_lcms_changed (GimpColorDisplay *display);
static GimpColorProfile cdisplay_lcms_get_rgb_profile (CdisplayLcms *lcms);
static GimpColorProfile cdisplay_lcms_get_display_profile (CdisplayLcms *lcms); static GimpColorProfile cdisplay_lcms_get_display_profile (CdisplayLcms *lcms);
static void cdisplay_lcms_attach_labelled (GtkTable *table, static void cdisplay_lcms_attach_labelled (GtkTable *table,
@ -279,42 +278,10 @@ cdisplay_lcms_changed (GimpColorDisplay *display)
lcms->src_format = babl_format ("R'G'B'A float"); lcms->src_format = babl_format ("R'G'B'A float");
lcms->dest_format = babl_format ("R'G'B'A float"); lcms->dest_format = babl_format ("R'G'B'A float");
lcms->transform = lcms->transform = gimp_widget_get_color_transform (widget,
gimp_widget_get_color_transform (widget, managed, config,
managed, config, &lcms->src_format,
&lcms->src_format, &lcms->dest_format);
&lcms->dest_format);
}
static GimpColorProfile
cdisplay_lcms_get_rgb_profile (CdisplayLcms *lcms)
{
GimpColorConfig *config;
GimpColorManaged *managed;
GimpColorProfile profile = NULL;
config = gimp_color_display_get_config (GIMP_COLOR_DISPLAY (lcms));
managed = gimp_color_display_get_managed (GIMP_COLOR_DISPLAY (lcms));
if (managed)
{
gsize len;
const guint8 *data = gimp_color_managed_get_icc_profile (managed, &len);
if (data)
profile = cmsOpenProfileFromMem ((gpointer) data, len);
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 static GimpColorProfile
@ -372,12 +339,14 @@ cdisplay_lcms_update_profile_label (CdisplayLcms *lcms,
const gchar *name) const gchar *name)
{ {
GimpColorConfig *config; GimpColorConfig *config;
GimpColorManaged *managed;
GtkWidget *label; GtkWidget *label;
GimpColorProfile profile = NULL; GimpColorProfile profile = NULL;
gchar *text; gchar *text;
gchar *tooltip; gchar *tooltip;
config = gimp_color_display_get_config (GIMP_COLOR_DISPLAY (lcms)); config = gimp_color_display_get_config (GIMP_COLOR_DISPLAY (lcms));
managed = gimp_color_display_get_managed (GIMP_COLOR_DISPLAY (lcms));
label = g_object_get_data (G_OBJECT (lcms), name); label = g_object_get_data (G_OBJECT (lcms), name);
@ -386,7 +355,7 @@ cdisplay_lcms_update_profile_label (CdisplayLcms *lcms,
if (strcmp (name, "rgb-profile") == 0) if (strcmp (name, "rgb-profile") == 0)
{ {
profile = cdisplay_lcms_get_rgb_profile (lcms); profile = gimp_color_managed_get_color_profile (managed);
} }
else if (g_str_has_prefix (name, "display-profile")) else if (g_str_has_prefix (name, "display-profile"))
{ {