push a colormap undo if the image was INDEXED. Fixes bug #113236. Minor

2003-05-18  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpimage-convert.c (gimp_image_convert): push a
	colormap undo if the image was INDEXED. Fixes bug #113236.
	Minor Cleanups.
This commit is contained in:
Michael Natterer 2003-05-18 19:21:53 +00:00 committed by Michael Natterer
parent 1358fafb0e
commit a27b88502f
2 changed files with 12 additions and 14 deletions

View File

@ -1,3 +1,9 @@
2003-05-18 Michael Natterer <mitch@gimp.org>
* app/core/gimpimage-convert.c (gimp_image_convert): push a
colormap undo if the image was INDEXED. Fixes bug #113236.
Minor Cleanups.
2003-05-18 Michael Natterer <mitch@gimp.org>
Implemented "Flip Image". Fixes bug #23179:

View File

@ -730,7 +730,7 @@ gimp_image_convert (GimpImage *gimage,
GimpConvertPaletteType palette_type,
GimpPalette *custom_palette)
{
QuantizeObj *quantobj;
QuantizeObj *quantobj = NULL;
GimpLayer *layer;
GimpLayer *floating_layer;
GimpImageBaseType old_type;
@ -739,10 +739,8 @@ gimp_image_convert (GimpImage *gimage,
TileManager *new_tiles;
const gchar *undo_desc = NULL;
g_return_if_fail (gimage != NULL);
g_return_if_fail (GIMP_IS_IMAGE (gimage));
quantobj = NULL;
g_return_if_fail (new_type != gimp_image_base_type (gimage));
theCustomPalette = custom_palette;
@ -780,6 +778,10 @@ gimp_image_convert (GimpImage *gimage,
old_type = gimage->base_type;
gimage->base_type = new_type;
/* If the image was INDEXED, push its colormap to the undo stack */
if (old_type == GIMP_INDEXED)
gimp_image_undo_push_image_colormap (gimage, NULL);
/* initialize the colour conversion routines */
cpercep_init_conversions();
@ -1011,16 +1013,6 @@ gimp_image_convert (GimpImage *gimage,
gimp_image_undo_group_end (gimage);
#if 0 /* gone in cvs */
/* shrink wrap and update all views */
gimp_image_invalidate_layer_previews (gimage);
gimp_viewable_invalidate_preview (GIMP_VIEWABLE (gimage));
gdisplays_update_title (gimage);
gdisplays_update_full (gimage);
gimp_image_colormap_changed (gimage, -1);
#endif
gimp_image_invalidate_layer_previews (gimage);
gimp_image_mode_changed (gimage);