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

Use the newly added profile utility functions all over the place

Browse Source
This commit is contained in:
Michael Natterer
2015-05-06 16:38:57 +02:00
parent 54553487f2
commit 6c800db1cc
10 changed files with 71 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,7 +562,7 @@ lcms_icc_apply (GimpColorConfig *config,
g_message (_("Color profile '%s' is not for RGB color space."),
gimp_file_get_utf8_name (file));
cmsCloseProfile (dest_profile);
gimp_lcms_profile_close (dest_profile);
g_object_unref (file);
return GIMP_PDB_EXECUTION_ERROR;
}
@ -590,8 +590,8 @@ lcms_icc_apply (GimpColorConfig *config,
gchar *src_label = gimp_lcms_profile_get_label (src_profile);
gchar *dest_label = gimp_lcms_profile_get_label (dest_profile);
cmsCloseProfile (src_profile);
cmsCloseProfile (dest_profile);
gimp_lcms_profile_close (src_profile);
gimp_lcms_profile_close (dest_profile);
g_printerr ("lcms: skipping conversion because profiles seem to be equal:\n");
g_printerr (" %s\n", src_label);
@ -620,8 +620,8 @@ lcms_icc_apply (GimpColorConfig *config,
status = GIMP_PDB_EXECUTION_ERROR;
}
cmsCloseProfile (src_profile);
cmsCloseProfile (dest_profile);
gimp_lcms_profile_close (src_profile);
gimp_lcms_profile_close (dest_profile);
if (file)
g_object_unref (file);
@ -657,7 +657,7 @@ lcms_icc_info (GimpColorConfig *config,
if (desc) *desc = gimp_lcms_profile_get_description (profile);
if (info) *info = gimp_lcms_profile_get_summary (profile);
cmsCloseProfile (profile);
gimp_lcms_profile_close (profile);
return GIMP_PDB_SUCCESS;
}
@ -680,7 +680,7 @@ lcms_icc_file_info (GFile *file,
*desc = gimp_lcms_profile_get_description (profile);
*info = gimp_lcms_profile_get_summary (profile);
cmsCloseProfile (profile);
gimp_lcms_profile_close (profile);
return GIMP_PDB_SUCCESS;
}
@ -709,20 +709,7 @@ lcms_image_get_profile (GimpColorConfig *config,
}
else if (config->rgb_profile)
{
GFile *file = g_file_new_for_path (config->rgb_profile);
profile = gimp_lcms_profile_open_from_file (file, error);
if (profile && ! gimp_lcms_profile_is_rgb (profile))
{
g_set_error (error, 0, 0,
_("Color profile '%s' is not for RGB color space"),
gimp_file_get_utf8_name (file));
cmsCloseProfile (profile);
profile = NULL;
}
g_object_unref (file);
profile = gimp_color_config_get_rgb_profile (config, error);
}
return profile;
@ -757,7 +744,7 @@ lcms_image_set_profile (gint32 image,
profile_data = gimp_lcms_profile_save_to_data (file_profile,
&profile_length,
&error);
cmsCloseProfile (file_profile);
gimp_lcms_profile_close (file_profile);
if (! profile_data)
{
@ -1270,29 +1257,19 @@ lcms_icc_combo_box_new (GimpColorConfig *config,
if (config->rgb_profile)
{
GFile *file = g_file_new_for_path (config->rgb_profile);
GError *error = NULL;
profile = gimp_lcms_profile_open_from_file (file, &error);
profile = gimp_color_config_get_rgb_profile (config, &error);
if (! profile)
{
g_message ("%s", error->message);
g_clear_error (&error);
}
else if (! gimp_lcms_profile_is_rgb (profile))
{
g_message (_("Color profile '%s' is not for RGB color space."),
gimp_filename_to_utf8 (config->rgb_profile));
cmsCloseProfile (profile);
profile = NULL;
}
else
{
rgb_filename = config->rgb_profile;
}
g_object_unref (file);
}
if (! profile)
@ -1302,7 +1279,7 @@ lcms_icc_combo_box_new (GimpColorConfig *config,
label = g_strdup_printf (_("RGB workspace (%s)"), name);
g_free (name);
cmsCloseProfile (profile);
gimp_lcms_profile_close (profile);
gimp_color_profile_combo_box_add (GIMP_COLOR_PROFILE_COMBO_BOX (combo),
rgb_filename, label);
@ -1480,10 +1457,10 @@ lcms_dialog (GimpColorConfig *config,
}
else
{
gimp_message (_("Destination profile is not for RGB color space."));
g_message (_("Destination profile is not for RGB color space."));
}
cmsCloseProfile (dest_profile);
gimp_lcms_profile_close (dest_profile);
}
if (file)
@ -1497,7 +1474,7 @@ lcms_dialog (GimpColorConfig *config,
gtk_widget_destroy (dialog);
cmsCloseProfile (src_profile);
gimp_lcms_profile_close (src_profile);
return (run ?
(success ? GIMP_PDB_SUCCESS : GIMP_PDB_EXECUTION_ERROR) :