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

Bug 754774 - Choosing "convert" upon import results in wrong colors... 

...being displayed

Need to call gimp_image_flush() on all newly opened images so whatever
image states are properly updated:

Call file_open_sanitize_image() at the end of loading (after profile
import), and re-enable the flush() call in the function.

Also, don't fiddle with undo disabling and enabling in
gimp_image_import_color_profile(). Instead, disable undo before
calling the function.
This commit is contained in:
Michael Natterer 2015-09-09 21:21:20 +02:00
parent 396bc89e56
commit 145a05ac9d
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/core/gimpimage-color-profile.c
View File

@ -465,15 +465,10 @@ gimp_image_import_color_profile (GimpImage *image,
intent = config->display_intent;
bpc = (intent == GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC);
gimp_image_undo_disable (image);
gimp_image_convert_color_profile (image, dest_profile,
intent, bpc,
progress, NULL);
gimp_image_clean_all (image);
gimp_image_undo_enable (image);
g_object_unref (dest_profile);
}
}

23
app/file/file-open.c
View File

@ -215,8 +215,6 @@ file_open_image (Gimp *gimp,
{
if (image)
{
file_open_sanitize_image (image, as_new);
/* Only set the load procedure if it hasn't already been set. */
if (! gimp_image_get_load_proc (image))
gimp_image_set_load_proc (image, file_proc);
@ -249,6 +247,8 @@ file_open_image (Gimp *gimp,
if (image)
{
gimp_image_undo_disable (image);
gimp_image_import_color_profile (image, context, progress,
run_mode == GIMP_RUN_INTERACTIVE ?
TRUE : FALSE);
@ -261,6 +261,9 @@ file_open_image (Gimp *gimp,
/* We shall treat this file as an Untitled file */
gimp_image_set_file (image, NULL);
}
/* Enables undo again */
file_open_sanitize_image (image, as_new);
}
return image;
@ -724,22 +727,8 @@ file_open_sanitize_image (GimpImage *image,
*/
gimp_image_clean_all (image);
#if 0
/* XXX this is not needed any longer, remove it when sure */
/* make sure the entire projection is properly constructed, because
* load plug-ins are not required to call gimp_drawable_update() or
* anything.
*/
gimp_image_invalidate (image,
0, 0,
gimp_image_get_width (image),
gimp_image_get_height (image));
/* Make sure all image states are up-to-date */
gimp_image_flush (image);
/* same for drawable previews */
gimp_image_invalidate_previews (image);
#endif
}
/* Converts items from one image to another */