mirror of https://github.com/GNOME/gimp.git
gimp-selection-* procedures operate on the image_ID, not on the selection
2007-08-29 Michael Natterer <mitch@gimp.org> * plug-ins/common/lcms.c (lcms_image_apply_profile): gimp-selection-* procedures operate on the image_ID, not on the selection drawable_ID itself. Fixes bug #470589. Also remove the saved selection channel after reloading it. svn path=/trunk/; revision=23393
This commit is contained in:
parent
22ae471cd0
commit
c53ed0aba8
|
@ -1,3 +1,10 @@
|
|||
2007-08-29 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* plug-ins/common/lcms.c (lcms_image_apply_profile):
|
||||
gimp-selection-* procedures operate on the image_ID, not on the
|
||||
selection drawable_ID itself. Fixes bug #470589. Also remove the
|
||||
saved selection channel after reloading it.
|
||||
|
||||
2007-08-29 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* themes/Default/images/preferences/Makefile.am (PREFS_IMAGES):
|
||||
|
|
|
@ -779,7 +779,6 @@ lcms_image_apply_profile (gint32 image,
|
|||
cmsHPROFILE dest_profile,
|
||||
const gchar *filename)
|
||||
{
|
||||
gint32 selection = gimp_image_get_selection (image);
|
||||
gint32 saved_selection = -1;
|
||||
|
||||
gimp_image_undo_group_start (image);
|
||||
|
@ -802,10 +801,10 @@ lcms_image_apply_profile (gint32 image,
|
|||
g_free (src);
|
||||
}
|
||||
|
||||
if (! gimp_selection_is_empty (selection))
|
||||
if (! gimp_selection_is_empty (image))
|
||||
{
|
||||
saved_selection = gimp_selection_save (selection);
|
||||
gimp_selection_none (selection);
|
||||
saved_selection = gimp_selection_save (image);
|
||||
gimp_selection_none (image);
|
||||
}
|
||||
|
||||
switch (gimp_image_base_type (image))
|
||||
|
@ -825,7 +824,10 @@ lcms_image_apply_profile (gint32 image,
|
|||
}
|
||||
|
||||
if (saved_selection != -1)
|
||||
gimp_selection_load (saved_selection);
|
||||
{
|
||||
gimp_selection_load (saved_selection);
|
||||
gimp_image_remove_channel (image, saved_selection);
|
||||
}
|
||||
|
||||
gimp_progress_update (1.0);
|
||||
gimp_displays_flush ();
|
||||
|
|
Loading…
Reference in New Issue