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

one more fix for bug #107949: don't take the selection into account if we 

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

	* app/core/gimpdrawable.c (gimp_drawable_mask_bounds): one
	more fix for bug #107949: don't take the selection into
	account if we are operating on the selection itself.

	Ordered shadow tiles functions together, cleanup.
This commit is contained in:
Michael Natterer 2003-10-06 18:26:06 +00:00 committed by Michael Natterer
parent 5989f5bf32
commit fdbbfff852
3 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2003-10-06 Michael Natterer <mitch@gimp.org>
* app/core/gimpdrawable.c (gimp_drawable_mask_bounds): one
more fix for bug #107949: don't take the selection into
account if we are operating on the selection itself.
Ordered shadow tiles functions together, cleanup.
2003-10-06 Michael Natterer <mitch@gimp.org>
* app/core/gimpdrawable-stroke.c

78
app/core/gimpdrawable.c
View File

@ -704,6 +704,23 @@ gimp_drawable_push_undo (GimpDrawable *drawable,
tiles, sparse);
}
TileManager *
gimp_drawable_shadow (GimpDrawable *drawable)
{
GimpItem *item;
GimpImage *gimage;
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
item = GIMP_ITEM (drawable);
gimage = gimp_item_get_image (item);
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
return gimp_image_shadow (gimage, item->width, item->height,
drawable->bytes);
}
void
gimp_drawable_merge_shadow (GimpDrawable *drawable,
gboolean push_undo,
@ -725,8 +742,8 @@ gimp_drawable_merge_shadow (GimpDrawable *drawable,
* them.
*/
gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
pixel_region_init (&shadowPR, gimage->shadow, x1, y1,
(x2 - x1), (y2 - y1), FALSE);
pixel_region_init (&shadowPR, gimage->shadow,
x1, y1, (x2 - x1), (y2 - y1), FALSE);
gimp_drawable_apply_region (drawable, &shadowPR,
push_undo, undo_desc,
GIMP_OPACITY_OPAQUE, GIMP_REPLACE_MODE,
@ -850,8 +867,9 @@ gimp_drawable_mask_bounds (GimpDrawable *drawable,
gint *x2,
gint *y2)
{
GimpItem *item;
GimpImage *gimage;
GimpItem *item;
GimpImage *gimage;
GimpChannel *selection;
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
g_return_val_if_fail (x1 != NULL, FALSE);
@ -864,7 +882,10 @@ gimp_drawable_mask_bounds (GimpDrawable *drawable,
g_return_val_if_fail (gimage != NULL, FALSE);
if (gimp_channel_bounds (gimp_image_get_mask (gimage), x1, y1, x2, y2))
selection = gimp_image_get_mask (gimage);
if (GIMP_DRAWABLE (selection) != drawable &&
gimp_channel_bounds (selection, x1, y1, x2, y2))
{
gint off_x, off_y;
@ -874,14 +895,16 @@ gimp_drawable_mask_bounds (GimpDrawable *drawable,
*y1 = CLAMP (*y1 - off_y, 0, gimp_item_height (item));
*x2 = CLAMP (*x2 - off_x, 0, gimp_item_width (item));
*y2 = CLAMP (*y2 - off_y, 0, gimp_item_height (item));
return TRUE;
}
else
{
*x2 = gimp_item_width (item);
*y2 = gimp_item_height (item);
return FALSE;
}
*x1 = 0;
*y1 = 0;
*x2 = gimp_item_width (item);
*y2 = gimp_item_height (item);
return FALSE;
}
gboolean
@ -932,31 +955,6 @@ gimp_drawable_is_indexed (const GimpDrawable *drawable)
return GIMP_IMAGE_TYPE_IS_INDEXED (gimp_drawable_type (drawable));
}
TileManager *
gimp_drawable_data (const GimpDrawable *drawable)
{
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
return drawable->tiles;
}
TileManager *
gimp_drawable_shadow (GimpDrawable *drawable)
{
GimpItem *item;
GimpImage *gimage;
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
item = GIMP_ITEM (drawable);
if (! (gimage = gimp_item_get_image (item)))
return NULL;
return gimp_image_shadow (gimage, item->width, item->height,
drawable->bytes);
}
gint
gimp_drawable_bytes (const GimpDrawable *drawable)
{
@ -977,6 +975,14 @@ gimp_drawable_bytes_with_alpha (const GimpDrawable *drawable)
return GIMP_IMAGE_TYPE_BYTES (type);
}
TileManager *
gimp_drawable_data (const GimpDrawable *drawable)
{
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
return drawable->tiles;
}
guchar *
gimp_drawable_cmap (const GimpDrawable *drawable)
{

7
app/core/gimpdrawable.h
View File

@ -84,8 +84,6 @@ struct _GimpDrawableClass
};
/* drawable access functions */
GType gimp_drawable_get_type (void) G_GNUC_CONST;
void gimp_drawable_configure (GimpDrawable *drawable,
@ -135,6 +133,7 @@ void gimp_drawable_push_undo (GimpDrawable *drawable,
TileManager *tiles,
gboolean sparse);
TileManager * gimp_drawable_shadow (GimpDrawable *drawable);
void gimp_drawable_merge_shadow (GimpDrawable *drawable,
gboolean push_undo,
const gchar *undo_desc);
@ -157,11 +156,11 @@ GimpImageType gimp_drawable_type_with_alpha (const GimpDrawable *drawable);
gboolean gimp_drawable_is_rgb (const GimpDrawable *drawable);
gboolean gimp_drawable_is_gray (const GimpDrawable *drawable);
gboolean gimp_drawable_is_indexed (const GimpDrawable *drawable);
TileManager * gimp_drawable_data (const GimpDrawable *drawable);
TileManager * gimp_drawable_shadow (GimpDrawable *drawable);
gint gimp_drawable_bytes (const GimpDrawable *drawable);
gint gimp_drawable_bytes_with_alpha (const GimpDrawable *drawable);
TileManager * gimp_drawable_data (const GimpDrawable *drawable);
guchar * gimp_drawable_cmap (const GimpDrawable *drawable);
guchar * gimp_drawable_get_color_at (GimpDrawable *drawable,