Commit f7bbdc3e authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

s/gimage_mask/gimp_image_mask/g

2001-11-28  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpimage-mask.[ch]: s/gimage_mask/gimp_image_mask/g

	* app/floating_sel.c
	* app/undo.c
	* app/undo_history.c
	* app/core/gimpchannel.c
	* app/core/gimpdrawable-blend.c
	* app/core/gimpdrawable-transform.c
	* app/core/gimpdrawable.c
	* app/core/gimpedit.c
	* app/core/gimpimage-crop.c
	* app/core/gimpimage-mask-select.c
	* app/core/gimpimage-resize.c
	* app/core/gimpimage-scale.c
	* app/core/gimpimage.c
	* app/display/gimpdisplayshell-qmask.c
	* app/display/gimpdisplayshell-selection.c
	* app/display/gimpdisplayshell.c
	* app/gui/channels-commands.c
	* app/gui/edit-commands.c
	* app/gui/layers-commands.c
	* app/gui/select-commands.c
	* app/tools/gimpbucketfilltool.c
	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpclonetool.c
	* app/tools/gimpcroptool.c
	* app/tools/gimpeditselectiontool.c
	* app/tools/gimpfliptool.c
	* app/tools/gimpfreeselecttool.c
	* app/tools/gimpinktool.c
	* app/tools/gimpmovetool.c
	* app/tools/gimppainttool.c
	* app/tools/gimprectselecttool.c
	* app/tools/gimpselectiontool.c
	* app/tools/gimptexttool.c
	* app/tools/gimptransformtool.c
	* app/widgets/gimpchannellistview.c
	* app/xcf/xcf-save.c
	* tools/pdbgen/pdb/edit.pdb
	* tools/pdbgen/pdb/selection.pdb: changed accordingly.

	* app/pdb/edit_cmds.c
	* app/pdb/selection_cmds.c: regenerated.
parent 6cf34005
2001-11-28 Michael Natterer <mitch@gimp.org>
* app/core/gimpimage-mask.[ch]: s/gimage_mask/gimp_image_mask/g
* app/floating_sel.c
* app/undo.c
* app/undo_history.c
* app/core/gimpchannel.c
* app/core/gimpdrawable-blend.c
* app/core/gimpdrawable-transform.c
* app/core/gimpdrawable.c
* app/core/gimpedit.c
* app/core/gimpimage-crop.c
* app/core/gimpimage-mask-select.c
* app/core/gimpimage-resize.c
* app/core/gimpimage-scale.c
* app/core/gimpimage.c
* app/display/gimpdisplayshell-qmask.c
* app/display/gimpdisplayshell-selection.c
* app/display/gimpdisplayshell.c
* app/gui/channels-commands.c
* app/gui/edit-commands.c
* app/gui/layers-commands.c
* app/gui/select-commands.c
* app/tools/gimpbucketfilltool.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpclonetool.c
* app/tools/gimpcroptool.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpfliptool.c
* app/tools/gimpfreeselecttool.c
* app/tools/gimpinktool.c
* app/tools/gimpmovetool.c
* app/tools/gimppainttool.c
* app/tools/gimprectselecttool.c
* app/tools/gimpselectiontool.c
* app/tools/gimptexttool.c
* app/tools/gimptransformtool.c
* app/widgets/gimpchannellistview.c
* app/xcf/xcf-save.c
* tools/pdbgen/pdb/edit.pdb
* tools/pdbgen/pdb/selection.pdb: changed accordingly.
* app/pdb/edit_cmds.c
* app/pdb/selection_cmds.c: regenerated.
2001-11-28 Michael Natterer <mitch@gimp.org>
* app/base/base-types.h: include the new
......
......@@ -153,7 +153,7 @@ channels_channel_to_sel_cmd_callback (GtkWidget *widget,
if ((active_channel = gimp_image_get_active_channel (gimage)))
{
gimage_mask_load (gimage, active_channel);
gimp_image_mask_load (gimage, active_channel);
gdisplays_flush ();
}
}
......@@ -178,7 +178,7 @@ channels_add_channel_to_sel_cmd_callback (GtkWidget *widget,
active_channel,
CHANNEL_OP_ADD,
0, 0); /* off x/y */
gimage_mask_load (gimage, new_channel);
gimp_image_mask_load (gimage, new_channel);
g_object_unref (G_OBJECT (new_channel));
gdisplays_flush ();
}
......@@ -204,7 +204,7 @@ channels_sub_channel_from_sel_cmd_callback (GtkWidget *widget,
active_channel,
CHANNEL_OP_SUB,
0, 0); /* off x/y */
gimage_mask_load (gimage, new_channel);
gimp_image_mask_load (gimage, new_channel);
g_object_unref (G_OBJECT (new_channel));
gdisplays_flush ();
}
......@@ -230,7 +230,7 @@ channels_intersect_channel_with_sel_cmd_callback (GtkWidget *widget,
active_channel,
CHANNEL_OP_INTERSECT,
0, 0); /* off x/y */
gimage_mask_load (gimage, new_channel);
gimp_image_mask_load (gimage, new_channel);
g_object_unref (G_OBJECT (new_channel));
gdisplays_flush ();
}
......
......@@ -262,9 +262,9 @@ edit_stroke_cmd_callback (GtkWidget *widget,
GimpImage *gimage;
return_if_no_image (gimage, data);
gimage_mask_stroke (gimage,
gimp_image_active_drawable (gimage),
gimp_get_current_context (gimage->gimp));
gimp_image_mask_stroke (gimage,
gimp_image_active_drawable (gimage),
gimp_get_current_context (gimage->gimp));
gdisplays_flush ();
}
......
......@@ -417,7 +417,7 @@ layers_alpha_select_cmd_callback (GtkWidget *widget,
if (! gimage)
return;
gimage_mask_layer_alpha (gimage, gimp_image_get_active_layer (gimage));
gimp_image_mask_layer_alpha (gimage, gimp_image_get_active_layer (gimage));
gdisplays_flush ();
}
......@@ -432,7 +432,7 @@ layers_mask_select_cmd_callback (GtkWidget *widget,
if (! gimage)
return;
gimage_mask_layer_mask (gimage, gimp_image_get_active_layer (gimage));
gimp_image_mask_layer_mask (gimage, gimp_image_get_active_layer (gimage));
gdisplays_flush ();
}
......
......@@ -120,7 +120,7 @@ gimp_display_shell_qmask_off_toggled (GtkWidget *widget,
* the qmask_state to FALSE
*/
undo_push_qmask (gimage);
gimage_mask_load (gimage, mask);
gimp_image_mask_load (gimage, mask);
gimp_image_remove_channel (gimage, mask);
undo_push_group_end (gimage);
}
......@@ -167,7 +167,7 @@ gimp_display_shell_qmask_on_toggled (GtkWidget *widget,
undo_push_group_start (gimage, QMASK_UNDO);
if (gimage_mask_is_empty (gimage))
if (gimp_image_mask_is_empty (gimage))
{
/* if no selection */
......@@ -193,7 +193,7 @@ gimp_display_shell_qmask_on_toggled (GtkWidget *widget,
gimp_image_add_channel (gimage, mask, 0);
gimp_channel_set_color (mask, &color);
gimp_object_set_name (GIMP_OBJECT (mask), "Qmask");
gimage_mask_none (gimage); /* Clear the selection */
gimp_image_mask_none (gimage); /* Clear the selection */
}
undo_push_qmask (gimage);
......
......@@ -120,7 +120,7 @@ gimp_display_shell_qmask_off_toggled (GtkWidget *widget,
* the qmask_state to FALSE
*/
undo_push_qmask (gimage);
gimage_mask_load (gimage, mask);
gimp_image_mask_load (gimage, mask);
gimp_image_remove_channel (gimage, mask);
undo_push_group_end (gimage);
}
......@@ -167,7 +167,7 @@ gimp_display_shell_qmask_on_toggled (GtkWidget *widget,
undo_push_group_start (gimage, QMASK_UNDO);
if (gimage_mask_is_empty (gimage))
if (gimp_image_mask_is_empty (gimage))
{
/* if no selection */
......@@ -193,7 +193,7 @@ gimp_display_shell_qmask_on_toggled (GtkWidget *widget,
gimp_image_add_channel (gimage, mask, 0);
gimp_channel_set_color (mask, &color);
gimp_object_set_name (GIMP_OBJECT (mask), "Qmask");
gimage_mask_none (gimage); /* Clear the selection */
gimp_image_mask_none (gimage); /* Clear the selection */
}
undo_push_qmask (gimage);
......
......@@ -49,22 +49,22 @@
/* local functions */
static void gimage_mask_feather_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data);
static void gimage_mask_border_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data);
static void gimage_mask_grow_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data);
static void gimage_mask_shrink_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data);
static void gimp_image_mask_feather_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data);
static void gimp_image_mask_border_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data);
static void gimp_image_mask_grow_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data);
static void gimp_image_mask_shrink_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data);
/* local variables */
......@@ -83,7 +83,7 @@ select_invert_cmd_callback (GtkWidget *widget,
GimpImage *gimage;
return_if_no_image (gimage, data);
gimage_mask_invert (gimage);
gimp_image_mask_invert (gimage);
gdisplays_flush ();
}
......@@ -94,7 +94,7 @@ select_all_cmd_callback (GtkWidget *widget,
GimpImage *gimage;
return_if_no_image (gimage, data);
gimage_mask_all (gimage);
gimp_image_mask_all (gimage);
gdisplays_flush ();
}
......@@ -105,7 +105,7 @@ select_none_cmd_callback (GtkWidget *widget,
GimpImage *gimage;
return_if_no_image (gimage, data);
gimage_mask_none (gimage);
gimp_image_mask_none (gimage);
gdisplays_flush ();
}
......@@ -116,7 +116,7 @@ select_float_cmd_callback (GtkWidget *widget,
GimpImage *gimage;
return_if_no_image (gimage, data);
gimage_mask_float (gimage, gimp_image_active_drawable (gimage), 0, 0);
gimp_image_mask_float (gimage, gimp_image_active_drawable (gimage), 0, 0);
gdisplays_flush ();
}
......@@ -138,7 +138,7 @@ select_feather_cmd_callback (GtkWidget *widget,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
G_OBJECT (gdisp->gimage), "disconnect",
gimage_mask_feather_callback, gdisp->gimage);
gimp_image_mask_feather_callback, gdisp->gimage);
gtk_widget_show (qbox);
}
......@@ -149,7 +149,7 @@ select_sharpen_cmd_callback (GtkWidget *widget,
GimpImage *gimage;
return_if_no_image (gimage, data);
gimage_mask_sharpen (gimage);
gimp_image_mask_sharpen (gimage);
gdisplays_flush ();
}
......@@ -174,7 +174,7 @@ select_shrink_cmd_callback (GtkWidget *widget,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
G_OBJECT (gdisp->gimage), "disconnect",
gimage_mask_shrink_callback, gdisp->gimage);
gimp_image_mask_shrink_callback, gdisp->gimage);
edge_lock = gtk_check_button_new_with_label (_("Shrink from image border"));
......@@ -211,7 +211,7 @@ select_grow_cmd_callback (GtkWidget *widget,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
G_OBJECT (gdisp->gimage), "disconnect",
gimage_mask_grow_callback, gdisp->gimage);
gimp_image_mask_grow_callback, gdisp->gimage);
gtk_widget_show (qbox);
}
......@@ -233,7 +233,7 @@ select_border_cmd_callback (GtkWidget *widget,
gdisp->gimage->yresolution),
gdisp->dot_for_dot,
G_OBJECT (gdisp->gimage), "disconnect",
gimage_mask_border_callback, gdisp->gimage);
gimp_image_mask_border_callback, gdisp->gimage);
gtk_widget_show (qbox);
}
......@@ -244,7 +244,7 @@ select_save_cmd_callback (GtkWidget *widget,
GimpImage *gimage;
return_if_no_image (gimage, data);
gimage_mask_save (gimage);
gimp_image_mask_save (gimage);
gdisplays_flush ();
}
......@@ -252,10 +252,10 @@ select_save_cmd_callback (GtkWidget *widget,
/* private functions */
static void
gimage_mask_feather_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data)
gimp_image_mask_feather_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data)
{
GimpImage *gimage;
gdouble radius_x;
......@@ -280,15 +280,15 @@ gimage_mask_feather_callback (GtkWidget *widget,
radius_x *= factor;
}
gimage_mask_feather (gimage, radius_x, radius_y);
gimp_image_mask_feather (gimage, radius_x, radius_y);
gdisplays_flush ();
}
static void
gimage_mask_border_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data)
gimp_image_mask_border_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data)
{
GimpImage *gimage;
gdouble radius_x;
......@@ -313,15 +313,15 @@ gimage_mask_border_callback (GtkWidget *widget,
radius_x *= factor;
}
gimage_mask_border (gimage, radius_x, radius_y);
gimp_image_mask_border (gimage, radius_x, radius_y);
gdisplays_flush ();
}
static void
gimage_mask_grow_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data)
gimp_image_mask_grow_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data)
{
GimpImage *gimage;
gdouble radius_x;
......@@ -346,15 +346,15 @@ gimage_mask_grow_callback (GtkWidget *widget,
radius_x *= factor;
}
gimage_mask_grow (gimage, radius_x, radius_y);
gimp_image_mask_grow (gimage, radius_x, radius_y);
gdisplays_flush ();
}
static void
gimage_mask_shrink_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data)
gimp_image_mask_shrink_callback (GtkWidget *widget,
gdouble size,
GimpUnit unit,
gpointer data)
{
GimpImage *gimage;
gint radius_x;
......@@ -383,6 +383,7 @@ gimage_mask_shrink_callback (GtkWidget *widget,
radius_x *= factor;
}
gimage_mask_shrink (gimage, radius_x, radius_y, selection_shrink_edge_lock);
gimp_image_mask_shrink (gimage, radius_x, radius_y,
selection_shrink_edge_lock);
gdisplays_flush ();
}
......@@ -62,10 +62,10 @@ gimp_edit_cut (GimpImage *gimage,
undo_push_group_start (gimage, EDIT_CUT_UNDO);
/* See if the gimage mask is empty */
empty = gimage_mask_is_empty (gimage);
empty = gimp_image_mask_is_empty (gimage);
/* Next, cut the mask portion from the gimage */
cut = gimage_mask_extract (gimage, drawable, TRUE, FALSE, TRUE);
cut = gimp_image_mask_extract (gimage, drawable, TRUE, FALSE, TRUE);
if (cut)
gimp_image_new_set_have_current_cut_buffer (gimage->gimp);
......@@ -114,10 +114,10 @@ gimp_edit_copy (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
/* See if the gimage mask is empty */
empty = gimage_mask_is_empty (gimage);
empty = gimp_image_mask_is_empty (gimage);
/* First, copy the masked portion of the gimage */
copy = gimage_mask_extract (gimage, drawable, FALSE, FALSE, TRUE);
copy = gimp_image_mask_extract (gimage, drawable, FALSE, FALSE, TRUE);
if (copy)
gimp_image_new_set_have_current_cut_buffer (gimage->gimp);
......@@ -208,7 +208,7 @@ gimp_edit_paste (GimpImage *gimage,
* this might not always be desired, but in general,
* it seems like the correct behavior.
*/
if (! gimage_mask_is_empty (gimage) && ! paste_into)
if (! gimp_image_mask_is_empty (gimage) && ! paste_into)
gimp_channel_clear (gimp_image_get_mask (gimage));
/* if there's a drawable, add a new floating selection */
......
......@@ -693,13 +693,13 @@ gimp_drawable_transform_cut (GimpDrawable *drawable,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
/* extract the selected mask if there is a selection */
if (! gimage_mask_is_empty (gimage))
if (! gimp_image_mask_is_empty (gimage))
{
/* set the keep_indexed flag to FALSE here, since we use
* gimp_layer_new_from_tiles() later which assumes that the tiles
* are either RGB or GRAY. Eeek!!! (Sven)
*/
tiles = gimage_mask_extract (gimage, drawable, TRUE, FALSE, TRUE);
tiles = gimp_image_mask_extract (gimage, drawable, TRUE, FALSE, TRUE);
*new_layer = TRUE;
}
......@@ -707,9 +707,9 @@ gimp_drawable_transform_cut (GimpDrawable *drawable,
else
{
if (GIMP_IS_LAYER (drawable))
tiles = gimage_mask_extract (gimage, drawable, FALSE, TRUE, TRUE);
tiles = gimp_image_mask_extract (gimage, drawable, FALSE, TRUE, TRUE);
else
tiles = gimage_mask_extract (gimage, drawable, FALSE, TRUE, FALSE);
tiles = gimp_image_mask_extract (gimage, drawable, FALSE, TRUE, FALSE);
*new_layer = FALSE;
}
......
......@@ -1225,7 +1225,7 @@ gimp_channel_push_undo (GimpChannel *mask)
/* push the undo buffer onto the undo stack */
gimage = GIMP_DRAWABLE (mask)->gimage;
undo_push_mask (gimage, mask_undo);
gimage_mask_invalidate (gimage);
gimp_image_mask_invalidate (gimage);
/* invalidate the preview */
GIMP_DRAWABLE (mask)->preview_valid = FALSE;
......
......@@ -45,9 +45,9 @@ gimp_image_mask_select_rectangle (GimpImage *gimage,
/* if applicable, replace the current selection */
if (op == CHANNEL_OP_REPLACE)
gimage_mask_clear (gimage);
gimp_image_mask_clear (gimage);
else
gimage_mask_undo (gimage);
gimp_image_mask_undo (gimage);
/* if feathering for rect, make a new mask with the
* rectangle and feather that with the old mask
......@@ -90,9 +90,9 @@ gimp_image_mask_select_ellipse (GimpImage *gimage,
/* if applicable, replace the current selection */
if (op == CHANNEL_OP_REPLACE)
gimage_mask_clear (gimage);
gimp_image_mask_clear (gimage);
else
gimage_mask_undo (gimage);
gimp_image_mask_undo (gimage);
/* if feathering for rect, make a new mask with the
* rectangle and feather that with the old mask
......@@ -139,9 +139,9 @@ gimp_image_mask_select_polygon (GimpImage *gimage,
* or insure that a floating selection is anchored down...
*/
if (op == CHANNEL_OP_REPLACE)
gimage_mask_clear (gimage);
gimp_image_mask_clear (gimage);
else
gimage_mask_undo (gimage);
gimp_image_mask_undo (gimage);
#define SUPERSAMPLE 3
......@@ -187,9 +187,9 @@ gimp_image_mask_select_channel (GimpImage *gimage,
/* if applicable, replace the current selection */
if (op == CHANNEL_OP_REPLACE)
gimage_mask_clear (gimage);
gimp_image_mask_clear (gimage);
else
gimage_mask_undo (gimage);
gimp_image_mask_undo (gimage);
if (sample_merged)
{
......
......@@ -1225,7 +1225,7 @@ gimp_channel_push_undo (GimpChannel *mask)
/* push the undo buffer onto the undo stack */
gimage = GIMP_DRAWABLE (mask)->gimage;
undo_push_mask (gimage, mask_undo);
gimage_mask_invalidate (gimage);
gimp_image_mask_invalidate (gimage);
/* invalidate the preview */
GIMP_DRAWABLE (mask)->preview_valid = FALSE;
......
......@@ -614,7 +614,7 @@ gradient_precalc_shapeburst (GimpImage *gimage,
pixel_region_init (&tempR, tempR.tiles, 0, 0, PR->w, PR->h, TRUE);
/* If the gimage mask is not empty, use it as the shape burst source */
if (! gimage_mask_is_empty (gimage))
if (! gimp_image_mask_is_empty (gimage))
{
PixelRegion maskR;
gint x1, y1, x2, y2;
......
......@@ -693,13 +693,13 @@ gimp_drawable_transform_cut (GimpDrawable *drawable,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
/* extract the selected mask if there is a selection */
if (! gimage_mask_is_empty (gimage))
if (! gimp_image_mask_is_empty (gimage))
{
/* set the keep_indexed flag to FALSE here, since we use
* gimp_layer_new_from_tiles() later which assumes that the tiles
* are either RGB or GRAY. Eeek!!! (Sven)
*/
tiles = gimage_mask_extract (gimage, drawable, TRUE, FALSE, TRUE);
tiles = gimp_image_mask_extract (gimage, drawable, TRUE, FALSE, TRUE);
*new_layer = TRUE;
}
......@@ -707,9 +707,9 @@ gimp_drawable_transform_cut (GimpDrawable *drawable,
else
{
if (GIMP_IS_LAYER (drawable))
tiles = gimage_mask_extract (gimage, drawable, FALSE, TRUE, TRUE);
tiles = gimp_image_mask_extract (gimage, drawable, FALSE, TRUE, TRUE);
else
tiles = gimage_mask_extract (gimage, drawable, FALSE, TRUE, FALSE);
tiles = gimp_image_mask_extract (gimage, drawable, FALSE, TRUE, FALSE);
*new_layer = FALSE;
}
......
......@@ -632,7 +632,7 @@ gimp_drawable_mask_bounds (GimpDrawable *drawable,
g_return_val_if_fail (gimage != NULL, FALSE);
if (gimage_mask_bounds (gimage, x1, y1, x2, y2))
if (gimp_image_mask_bounds (gimage, x1, y1, x2, y2))
{
gimp_drawable_offsets (drawable, &off_x, &off_y);
*x1 = CLAMP (*x1 - off_x, 0, gimp_drawable_width (drawable));
......
......@@ -62,10 +62,10 @@ gimp_edit_cut (GimpImage *gimage,
undo_push_group_start (gimage, EDIT_CUT_UNDO);
/* See if the gimage mask is empty */
empty = gimage_mask_is_empty (gimage);
empty = gimp_image_mask_is_empty (gimage);
/* Next, cut the mask portion from the gimage */
cut = gimage_mask_extract (gimage, drawable, TRUE, FALSE, TRUE);
cut = gimp_image_mask_extract (gimage, drawable, TRUE, FALSE, TRUE);
if (cut)
gimp_image_new_set_have_current_cut_buffer (gimage->gimp);
......@@ -114,10 +114,10 @@ gimp_edit_copy (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
/* See if the gimage mask is empty */
empty = gimage_mask_is_empty (gimage);
empty = gimp_image_mask_is_empty (gimage);
/* First, copy the masked portion of the gimage */
copy = gimage_mask_extract (gimage, drawable, FALSE, FALSE, TRUE);
copy = gimp_image_mask_extract (gimage, drawable, FALSE, FALSE, TRUE);
if (copy)
gimp_image_new_set_have_current_cut_buffer (gimage->gimp);
......@@ -208,7 +208,7 @@ gimp_edit_paste (GimpImage *gimage,
* this might not always be desired, but in general,
* it seems like the correct behavior.
*/
if (! gimage_mask_is_empty (gimage) && ! paste_into)
if (! gimp_image_mask_is_empty (gimage) && ! paste_into)
gimp_channel_clear (gimp_image_get_mask (gimage));
/* if there's a drawable, add a new floating selection */
......
......@@ -163,7 +163,7 @@ gimp_image_crop (GimpImage *gimage,
/* Don't forget the selection mask! */
gimp_channel_resize (gimage->selection_mask, width, height, -x1, -y1);
gimage_mask_invalidate (gimage);
gimp_image_mask_invalidate (gimage);
/* crop all layers */
list = GIMP_LIST (gimage->layers)->list;
......