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

libgimpwidgets: make GimpColorProfileComboBox use lcms

Browse Source 
and improve gimp_color_profile_combo_box_set_active() to get the
profile's label from the ICC file if no label was provided. Simplifies
all its callers and removes code duplication.
This commit is contained in:
Michael Natterer
2014-04-02 13:03:52 +02:00
parent 80a71f1e50
commit 3f826d02fa
4 changed files with 44 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/display-filter-proof.c
View File

@ -259,26 +259,6 @@ cdisplay_proof_convert_buffer (GimpColorDisplay *display,
}
}
static void
cdisplay_proof_combo_box_set_active (GimpColorProfileComboBox *combo,
const gchar *filename)
{
cmsHPROFILE profile = NULL;
gchar *label = NULL;
if (filename)
profile = cmsOpenProfileFromFile (filename, "r");
if (profile)
{
label = gimp_lcms_profile_get_label (profile);
cmsCloseProfile (profile);
}
gimp_color_profile_combo_box_set_active (combo, filename, label);
g_free (label);
}
static void
cdisplay_proof_file_chooser_dialog_response (GtkFileChooser *dialog,
gint response,
@ -290,7 +270,7 @@ cdisplay_proof_file_chooser_dialog_response (GtkFileChooser *dialog,
if (filename)
{
cdisplay_proof_combo_box_set_active (combo, filename);
gimp_color_profile_combo_box_set_active (combo, filename, NULL);
g_free (filename);
}
@ -343,8 +323,8 @@ cdisplay_proof_configure (GimpColorDisplay *display)
proof);
if (proof->profile)
cdisplay_proof_combo_box_set_active (GIMP_COLOR_PROFILE_COMBO_BOX (combo),
proof->profile);
gimp_color_profile_combo_box_set_active (GIMP_COLOR_PROFILE_COMBO_BOX (combo),
proof->profile, NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("_Profile:"), 0.0, 0.5,