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

plug-ins: use gimp_image_get_effective_color_profile() in the lcms plug-in

This commit is contained in:
Michael Natterer 2015-06-07 01:58:10 +02:00
parent 16749cd395
commit 0d01cfd56b
1 changed files with 14 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
plug-ins/common/lcms.c
View File

@ -104,10 +104,6 @@ static GimpPDBStatusType lcms_icc_file_info (GFile *file,
gchar **info, gchar **info,
GError **error); GError **error);
static GimpColorProfile
lcms_image_get_profile (GimpColorConfig *config,
gint32 image,
GError **error);
static gboolean lcms_image_set_profile (gint32 image, static gboolean lcms_image_set_profile (gint32 image,
GFile *file); GFile *file);
static gboolean lcms_image_apply_profile (gint32 image, static gboolean lcms_image_apply_profile (gint32 image,
@ -531,9 +527,8 @@ lcms_icc_apply (GimpColorConfig *config,
gboolean *dont_ask) gboolean *dont_ask)
{ {
GimpPDBStatusType status = GIMP_PDB_SUCCESS; GimpPDBStatusType status = GIMP_PDB_SUCCESS;
cmsHPROFILE src_profile = NULL; GimpColorProfile src_profile = NULL;
cmsHPROFILE dest_profile = NULL; GimpColorProfile dest_profile = NULL;
GError *error = NULL;
g_return_val_if_fail (GIMP_IS_COLOR_CONFIG (config), GIMP_PDB_CALLING_ERROR); g_return_val_if_fail (GIMP_IS_COLOR_CONFIG (config), GIMP_PDB_CALLING_ERROR);
g_return_val_if_fail (image != -1, GIMP_PDB_CALLING_ERROR); g_return_val_if_fail (image != -1, GIMP_PDB_CALLING_ERROR);
@ -568,19 +563,7 @@ lcms_icc_apply (GimpColorConfig *config,
} }
} }
src_profile = lcms_image_get_profile (config, image, &error); src_profile = gimp_image_get_effective_color_profile (image);
if (error)
{
g_message ("%s", error->message);
g_clear_error (&error);
}
if (! src_profile && ! dest_profile)
return GIMP_PDB_SUCCESS;
if (! src_profile)
src_profile = gimp_color_profile_new_srgb ();
if (! dest_profile) if (! dest_profile)
dest_profile = gimp_color_profile_new_srgb (); dest_profile = gimp_color_profile_new_srgb ();
@ -636,22 +619,12 @@ lcms_icc_info (GimpColorConfig *config,
gchar **desc, gchar **desc,
gchar **info) gchar **info)
{ {
cmsHPROFILE profile; GimpColorProfile profile;
GError *error = NULL;
g_return_val_if_fail (GIMP_IS_COLOR_CONFIG (config), GIMP_PDB_CALLING_ERROR); g_return_val_if_fail (GIMP_IS_COLOR_CONFIG (config), GIMP_PDB_CALLING_ERROR);
g_return_val_if_fail (image != -1, GIMP_PDB_CALLING_ERROR); g_return_val_if_fail (image != -1, GIMP_PDB_CALLING_ERROR);
profile = lcms_image_get_profile (config, image, &error); profile = gimp_image_get_effective_color_profile (image);
if (error)
{
g_message ("%s", error->message);
g_clear_error (&error);
}
if (! profile)
profile = gimp_color_profile_new_srgb ();
if (name) *name = gimp_color_profile_get_model (profile); if (name) *name = gimp_color_profile_get_model (profile);
if (desc) *desc = gimp_color_profile_get_description (profile); if (desc) *desc = gimp_color_profile_get_description (profile);
@ -685,23 +658,6 @@ lcms_icc_file_info (GFile *file,
return GIMP_PDB_SUCCESS; return GIMP_PDB_SUCCESS;
} }
static GimpColorProfile
lcms_image_get_profile (GimpColorConfig *config,
gint32 image,
GError **error)
{
GimpColorProfile profile;
g_return_val_if_fail (image != -1, NULL);
profile = gimp_image_get_color_profile (image);
if (! profile)
profile = gimp_color_config_get_rgb_color_profile (config, error);
return profile;
}
static gboolean static gboolean
lcms_image_set_profile (gint32 image, lcms_image_set_profile (gint32 image,
GFile *file) GFile *file)
@ -1166,22 +1122,12 @@ lcms_dialog (GimpColorConfig *config,
GtkWidget *frame; GtkWidget *frame;
GtkWidget *label; GtkWidget *label;
GtkWidget *combo; GtkWidget *combo;
cmsHPROFILE src_profile; GimpColorProfile src_profile;
gchar *name; gchar *name;
gboolean success = FALSE; gboolean success = FALSE;
gboolean run; gboolean run;
GError *error = NULL;
src_profile = lcms_image_get_profile (config, image, &error); src_profile = gimp_image_get_effective_color_profile (image);
if (error)
{
g_message ("%s", error->message);
g_clear_error (&error);
}
if (! src_profile)
src_profile = gimp_color_profile_new_srgb ();
gimp_ui_init (PLUG_IN_BINARY, FALSE); gimp_ui_init (PLUG_IN_BINARY, FALSE);
@ -1278,14 +1224,17 @@ lcms_dialog (GimpColorConfig *config,
while ((run = gimp_dialog_run (GIMP_DIALOG (dialog))) == GTK_RESPONSE_OK) while ((run = gimp_dialog_run (GIMP_DIALOG (dialog))) == GTK_RESPONSE_OK)
{ {
gchar *filename = gimp_color_profile_combo_box_get_active (box); gchar *filename = gimp_color_profile_combo_box_get_active (box);
GFile *file = NULL; GFile *file = NULL;
cmsHPROFILE dest_profile; GimpColorProfile dest_profile;
gtk_widget_set_sensitive (dialog, FALSE); gtk_widget_set_sensitive (dialog, FALSE);
if (filename) if (filename)
file = g_file_new_for_path (filename); {
file = g_file_new_for_path (filename);
g_free (filename);
}
if (file) if (file)
{ {