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

app: honor precision when copying drawables between images

Browse Source
This commit is contained in:
Michael Natterer
2012-04-25 11:44:40 +02:00
parent 5167550271
commit 0e8a00db8b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/core/gimpdrawable.c
View File

@ -1159,7 +1159,10 @@ gimp_drawable_convert_type (GimpDrawable *drawable,
{ {
g_return_if_fail (GIMP_IS_DRAWABLE (drawable)); g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (GIMP_IS_IMAGE (dest_image)); g_return_if_fail (GIMP_IS_IMAGE (dest_image));
g_return_if_fail (new_base_type != gimp_drawable_get_base_type (drawable)); g_return_if_fail (new_base_type !=
gimp_drawable_get_base_type (drawable) ||
gimp_image_get_precision (dest_image) !=
gimp_drawable_get_precision (drawable));
if (! gimp_item_is_attached (GIMP_ITEM (drawable))) if (! gimp_item_is_attached (GIMP_ITEM (drawable)))
push_undo = FALSE; push_undo = FALSE;

8
app/core/gimplayer.c
View File

@ -609,11 +609,17 @@ gimp_layer_convert (GimpItem *item,
GimpDrawable *drawable = GIMP_DRAWABLE (item); GimpDrawable *drawable = GIMP_DRAWABLE (item);
GimpImageBaseType old_base_type; GimpImageBaseType old_base_type;
GimpImageBaseType new_base_type; GimpImageBaseType new_base_type;
GimpPrecision old_precision;
GimpPrecision new_precision;
old_base_type = gimp_drawable_get_base_type (drawable); old_base_type = gimp_drawable_get_base_type (drawable);
new_base_type = gimp_image_base_type (dest_image); new_base_type = gimp_image_base_type (dest_image);
if (old_base_type != new_base_type) old_precision = gimp_drawable_get_precision (drawable);
new_precision = gimp_image_get_precision (dest_image);
if (old_base_type != new_base_type ||
old_precision != new_precision)
gimp_drawable_convert_type (drawable, dest_image, new_base_type, FALSE); gimp_drawable_convert_type (drawable, dest_image, new_base_type, FALSE);
if (layer->mask) if (layer->mask)