libgimpwidgets: return the formats from gimp_widget_get_color_transform()

Turn the src_format and dest_formats into "const Babl **" and make
them return the actually used formats. Change the lcms display module
accordingly.
This commit is contained in:
Michael Natterer
2015-05-11 00:42:23 +02:00
parent 4d9cf01965
commit 394bc25be1
3 changed files with 35 additions and 30 deletions

View File

@ -499,11 +499,11 @@ get_display_profile (GtkWidget *widget,
}
GimpColorTransform
gimp_widget_get_color_transform (GtkWidget *widget,
GimpColorManaged *managed,
GimpColorConfig *config,
const Babl *src_format,
const Babl *dest_format)
gimp_widget_get_color_transform (GtkWidget *widget,
GimpColorManaged *managed,
GimpColorConfig *config,
const Babl **src_format,
const Babl **dest_format)
{
GimpColorTransform transform = NULL;
GimpColorProfile src_profile = NULL;
@ -534,8 +534,8 @@ gimp_widget_get_color_transform (GtkWidget *widget,
break;
}
src_format = gimp_lcms_get_format (src_format, &lcms_src_format);
dest_format = gimp_lcms_get_format (dest_format, &lcms_dest_format);
*src_format = gimp_lcms_get_format (*src_format, &lcms_src_format);
*dest_format = gimp_lcms_get_format (*dest_format, &lcms_dest_format);
if (proof_profile)
{