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

set the item's new image *after* converting it because we need the old 

2003-10-02  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpitem.c (gimp_item_convert,gimp_item_real_convert):
	set the item's new image *after* converting it because we need the
	old image's colormap for conversions from and to INDEXED.
	Fixes bug #123625.
This commit is contained in:
Michael Natterer 2003-10-02 11:42:43 +00:00 committed by Michael Natterer
parent 89d936f3aa
commit 86411380c6
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-10-02 Michael Natterer <mitch@gimp.org>
* app/core/gimpitem.c (gimp_item_convert,gimp_item_real_convert):
set the item's new image *after* converting it because we need the
old image's colormap for conversions from and to INDEXED.
Fixes bug #123625.
2003-10-02 Michael Natterer <mitch@gimp.org>
Cleaned up the app init and exit stuff even more. Also reduces the

30
app/core/gimpitem.c
View File

@ -332,19 +332,7 @@ gimp_item_real_convert (GimpItem *item,
GType new_type,
gboolean add_alpha)
{
GimpItem *new_item;
new_item = gimp_item_duplicate (item, new_type, add_alpha);
if (dest_image != item->gimage)
{
gimp_item_set_image (new_item, dest_image);
/* force a unique name */
gimp_object_name_changed (GIMP_OBJECT (new_item));
}
return new_item;
return gimp_item_duplicate (item, new_type, add_alpha);
}
static void
@ -452,13 +440,25 @@ gimp_item_convert (GimpItem *item,
GType new_type,
gboolean add_alpha)
{
GimpItem *new_item;
g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
g_return_val_if_fail (GIMP_IS_IMAGE (item->gimage), NULL);
g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
g_return_val_if_fail (g_type_is_a (new_type, GIMP_TYPE_ITEM), NULL);
return GIMP_ITEM_GET_CLASS (item)->convert (item, dest_image,
new_type, add_alpha);
new_item = GIMP_ITEM_GET_CLASS (item)->convert (item, dest_image,
new_type, add_alpha);
if (dest_image != item->gimage)
{
gimp_item_set_image (new_item, dest_image);
/* force a unique name */
gimp_object_name_changed (GIMP_OBJECT (new_item));
}
return new_item;
}
void