mirror of https://github.com/GNOME/gimp.git
removed the feather(), sharpen(), all(), invert(), border(), grow() and
2003-09-03 Michael Natterer <mitch@gimp.org> * app/core/gimpimage-mask.[ch]: removed the feather(), sharpen(), all(), invert(), border(), grow() and shrink() wrappers. * app/core/gimpselection.[ch]: changed gimp_selection_invalidate() and gimp_selection_push_undo() to take GimpChannel parameters, not GimpSelection ones. They will be made virtual GimpChannel functions anyway. * app/core/gimpedit.c * app/gui/select-commands.c * app/widgets/gimpselectioneditor.c * tools/pdbgen/pdb/selection.pdb: changed accordingly. * app/pdb/selection_cmds.c: regenerated.
This commit is contained in:
Michael Natterer
Michael Natterer
parent
6d1b9fa9cb
commit
6ce4e7102c
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2003-09-03 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/core/gimpimage-mask.[ch]: removed the feather(), sharpen(),
|
||||
all(), invert(), border(), grow() and shrink() wrappers.
|
||||
|
||||
* app/core/gimpselection.[ch]: changed gimp_selection_invalidate()
|
||||
and gimp_selection_push_undo() to take GimpChannel parameters, not
|
||||
GimpSelection ones. They will be made virtual GimpChannel
|
||||
functions anyway.
|
||||
|
||||
* app/core/gimpedit.c
|
||||
* app/gui/select-commands.c
|
||||
* app/widgets/gimpselectioneditor.c
|
||||
* tools/pdbgen/pdb/selection.pdb: changed accordingly.
|
||||
|
||||
* app/pdb/selection_cmds.c: regenerated.
|
||||
|
||||
2003-09-03 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* libgimpcolor/gimpcolor.def: added gimp_rgb_to_cmyk_int().
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include "gui-types.h"
|
||||
|
||||
#include "core/gimp.h"
|
||||
#include "core/gimpchannel.h"
|
||||
#include "core/gimpcontext.h"
|
||||
#include "core/gimpimage.h"
|
||||
#include "core/gimpimage-mask.h"
|
||||
|
|
@ -100,7 +101,7 @@ select_invert_cmd_callback (GtkWidget *widget,
|
|||
GimpImage *gimage;
|
||||
return_if_no_image (gimage, data);
|
||||
|
||||
gimp_image_mask_invert (gimage);
|
||||
gimp_channel_invert (gimp_image_get_mask (gimage), TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -111,7 +112,7 @@ select_all_cmd_callback (GtkWidget *widget,
|
|||
GimpImage *gimage;
|
||||
return_if_no_image (gimage, data);
|
||||
|
||||
gimp_image_mask_all (gimage);
|
||||
gimp_channel_all (gimp_image_get_mask (gimage), TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -122,7 +123,7 @@ select_none_cmd_callback (GtkWidget *widget,
|
|||
GimpImage *gimage;
|
||||
return_if_no_image (gimage, data);
|
||||
|
||||
gimp_image_mask_clear (gimage, NULL);
|
||||
gimp_channel_clear (gimp_image_get_mask (gimage), NULL, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -167,7 +168,7 @@ select_sharpen_cmd_callback (GtkWidget *widget,
|
|||
GimpImage *gimage;
|
||||
return_if_no_image (gimage, data);
|
||||
|
||||
gimp_image_mask_sharpen (gimage);
|
||||
gimp_channel_sharpen (gimp_image_get_mask (gimage), TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -307,7 +308,7 @@ gimp_image_mask_feather_callback (GtkWidget *widget,
|
|||
radius_x *= factor;
|
||||
}
|
||||
|
||||
gimp_image_mask_feather (gimage, radius_x, radius_y);
|
||||
gimp_channel_feather (gimp_image_get_mask (gimage), radius_x, radius_y, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -340,7 +341,7 @@ gimp_image_mask_border_callback (GtkWidget *widget,
|
|||
radius_x *= factor;
|
||||
}
|
||||
|
||||
gimp_image_mask_border (gimage, radius_x, radius_y);
|
||||
gimp_channel_border (gimp_image_get_mask (gimage), radius_x, radius_y, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -373,7 +374,7 @@ gimp_image_mask_grow_callback (GtkWidget *widget,
|
|||
radius_x *= factor;
|
||||
}
|
||||
|
||||
gimp_image_mask_grow (gimage, radius_x, radius_y);
|
||||
gimp_channel_grow (gimp_image_get_mask (gimage), radius_x, radius_y, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -410,7 +411,7 @@ gimp_image_mask_shrink_callback (GtkWidget *widget,
|
|||
radius_x *= factor;
|
||||
}
|
||||
|
||||
gimp_image_mask_shrink (gimage, radius_x, radius_y,
|
||||
selection_shrink_edge_lock);
|
||||
gimp_channel_shrink (gimp_image_get_mask (gimage), radius_x, radius_y,
|
||||
selection_shrink_edge_lock, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ gimp_edit_paste (GimpImage *gimage,
|
|||
* it seems like the correct behavior.
|
||||
*/
|
||||
if (! gimp_image_mask_is_empty (gimage) && ! paste_into)
|
||||
gimp_image_mask_clear (gimage, NULL);
|
||||
gimp_channel_clear (gimp_image_get_mask (gimage), NULL, TRUE);
|
||||
|
||||
/* if there's a drawable, add a new floating selection */
|
||||
if (drawable != NULL)
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ gimp_edit_paste (GimpImage *gimage,
|
|||
* it seems like the correct behavior.
|
||||
*/
|
||||
if (! gimp_image_mask_is_empty (gimage) && ! paste_into)
|
||||
gimp_image_mask_clear (gimage, NULL);
|
||||
gimp_channel_clear (gimp_image_get_mask (gimage), NULL, TRUE);
|
||||
|
||||
/* if there's a drawable, add a new floating selection */
|
||||
if (drawable != NULL)
|
||||
|
|
|
|||
|
|
@ -91,27 +91,6 @@ gimp_image_mask_is_empty (GimpImage *gimage)
|
|||
return gimp_channel_is_empty (gimp_image_get_mask (gimage));
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_feather (GimpImage *gimage,
|
||||
gdouble feather_radius_x,
|
||||
gdouble feather_radius_y)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_channel_feather (gimp_image_get_mask (gimage),
|
||||
feather_radius_x,
|
||||
feather_radius_y,
|
||||
TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_sharpen (GimpImage *gimage)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_channel_sharpen (gimp_image_get_mask (gimage), TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_clear (GimpImage *gimage,
|
||||
const gchar *undo_desc)
|
||||
|
|
@ -121,70 +100,13 @@ gimp_image_mask_clear (GimpImage *gimage,
|
|||
gimp_channel_clear (gimp_image_get_mask (gimage), undo_desc, TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_all (GimpImage *gimage)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_channel_all (gimp_image_get_mask (gimage), TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_invert (GimpImage *gimage)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_channel_invert (gimp_image_get_mask (gimage), TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_border (GimpImage *gimage,
|
||||
gint border_radius_x,
|
||||
gint border_radius_y)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_channel_border (gimp_image_get_mask (gimage),
|
||||
border_radius_x,
|
||||
border_radius_y,
|
||||
TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_grow (GimpImage *gimage,
|
||||
gint grow_pixels_x,
|
||||
gint grow_pixels_y)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_channel_grow (gimp_image_get_mask (gimage),
|
||||
grow_pixels_x,
|
||||
grow_pixels_y,
|
||||
TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_shrink (GimpImage *gimage,
|
||||
gint shrink_pixels_x,
|
||||
gint shrink_pixels_y,
|
||||
gboolean edge_lock)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_channel_shrink (gimp_image_get_mask (gimage),
|
||||
shrink_pixels_x,
|
||||
shrink_pixels_y,
|
||||
edge_lock,
|
||||
TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_image_mask_push_undo (GimpImage *gimage,
|
||||
const gchar *undo_desc)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_selection_push_undo (GIMP_SELECTION (gimp_image_get_mask (gimage)),
|
||||
gimp_selection_push_undo (gimp_image_get_mask (gimage),
|
||||
undo_desc);
|
||||
}
|
||||
|
||||
|
|
@ -193,7 +115,7 @@ gimp_image_mask_invalidate (GimpImage *gimage)
|
|||
{
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_selection_invalidate (GIMP_SELECTION (gimp_image_get_mask (gimage)));
|
||||
gimp_selection_invalidate (gimp_image_get_mask (gimage));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,24 +37,8 @@ gint gimp_image_mask_value (GimpImage *gimage,
|
|||
gint y);
|
||||
gboolean gimp_image_mask_is_empty (GimpImage *gimage);
|
||||
|
||||
void gimp_image_mask_feather (GimpImage *gimage,
|
||||
gdouble feather_radius_x,
|
||||
gdouble feather_radius_y);
|
||||
void gimp_image_mask_sharpen (GimpImage *gimage);
|
||||
void gimp_image_mask_clear (GimpImage *gimage,
|
||||
const gchar *undo_name);
|
||||
void gimp_image_mask_all (GimpImage *gimage);
|
||||
void gimp_image_mask_invert (GimpImage *gimage);
|
||||
void gimp_image_mask_border (GimpImage *gimage,
|
||||
gint border_radius_x,
|
||||
gint border_radius_y);
|
||||
void gimp_image_mask_grow (GimpImage *gimage,
|
||||
gint grow_pixels_x,
|
||||
gint grow_pixels_y);
|
||||
void gimp_image_mask_shrink (GimpImage *gimage,
|
||||
gint shrink_pixels_x,
|
||||
gint shrink_pixels_y,
|
||||
gboolean edge_lock);
|
||||
|
||||
|
||||
/* pure wrappers around the resp. GimpSelection functions: */
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ static void gimp_selection_shrink (GimpChannel *channel,
|
|||
gboolean edge_lock,
|
||||
gboolean push_undo);
|
||||
|
||||
static void gimp_selection_changed (GimpSelection *selection);
|
||||
static void gimp_selection_changed (GimpChannel *selection);
|
||||
static void gimp_selection_validate (TileManager *tm,
|
||||
Tile *tile);
|
||||
|
||||
|
|
@ -193,7 +193,7 @@ gimp_selection_translate (GimpItem *item,
|
|||
gint offset_y,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (item);
|
||||
GimpChannel *selection = GIMP_CHANNEL (item);
|
||||
|
||||
if (push_undo)
|
||||
gimp_selection_push_undo (selection, _("Move Selection"));
|
||||
|
|
@ -213,7 +213,7 @@ gimp_selection_scale (GimpItem *item,
|
|||
gint new_offset_y,
|
||||
GimpInterpolationType interp_type)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (item);
|
||||
GimpChannel *selection = GIMP_CHANNEL (item);
|
||||
|
||||
gimp_selection_invalidate (selection);
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ gimp_selection_resize (GimpItem *item,
|
|||
gint off_x,
|
||||
gint off_y)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (item);
|
||||
GimpChannel *selection = GIMP_CHANNEL (item);
|
||||
|
||||
gimp_selection_invalidate (selection);
|
||||
|
||||
|
|
@ -253,7 +253,7 @@ gimp_selection_flip (GimpItem *item,
|
|||
gdouble axis,
|
||||
gboolean clip_result)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (item);
|
||||
GimpChannel *selection = GIMP_CHANNEL (item);
|
||||
|
||||
gimp_selection_invalidate (selection);
|
||||
|
||||
|
|
@ -269,7 +269,7 @@ gimp_selection_rotate (GimpItem *item,
|
|||
gdouble center_y,
|
||||
gboolean clip_result)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (item);
|
||||
GimpChannel *selection = GIMP_CHANNEL (item);
|
||||
|
||||
gimp_selection_invalidate (selection);
|
||||
|
||||
|
|
@ -445,33 +445,29 @@ gimp_selection_feather (GimpChannel *channel,
|
|||
gdouble radius_y,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (channel);
|
||||
|
||||
if (push_undo)
|
||||
gimp_selection_push_undo (selection, _("Feather Selection"));
|
||||
gimp_selection_push_undo (channel, _("Feather Selection"));
|
||||
else
|
||||
gimp_selection_invalidate (selection);
|
||||
gimp_selection_invalidate (channel);
|
||||
|
||||
GIMP_CHANNEL_CLASS (parent_class)->feather (channel, radius_x, radius_y,
|
||||
FALSE);
|
||||
|
||||
gimp_selection_changed (selection);
|
||||
gimp_selection_changed (channel);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_selection_sharpen (GimpChannel *channel,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (channel);
|
||||
|
||||
if (push_undo)
|
||||
gimp_selection_push_undo (selection, _("Sharpen Selection"));
|
||||
gimp_selection_push_undo (channel, _("Sharpen Selection"));
|
||||
else
|
||||
gimp_selection_invalidate (selection);
|
||||
gimp_selection_invalidate (channel);
|
||||
|
||||
GIMP_CHANNEL_CLASS (parent_class)->sharpen (channel, FALSE);
|
||||
|
||||
gimp_selection_changed (selection);
|
||||
gimp_selection_changed (channel);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -479,53 +475,47 @@ gimp_selection_clear (GimpChannel *channel,
|
|||
const gchar *undo_desc,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (channel);
|
||||
|
||||
if (push_undo)
|
||||
{
|
||||
if (! undo_desc)
|
||||
undo_desc = _("Select None");
|
||||
|
||||
gimp_selection_push_undo (selection, undo_desc);
|
||||
gimp_selection_push_undo (channel, undo_desc);
|
||||
}
|
||||
else
|
||||
gimp_selection_invalidate (selection);
|
||||
gimp_selection_invalidate (channel);
|
||||
|
||||
GIMP_CHANNEL_CLASS (parent_class)->clear (channel, NULL, FALSE);
|
||||
|
||||
gimp_selection_changed (selection);
|
||||
gimp_selection_changed (channel);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_selection_all (GimpChannel *channel,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (channel);
|
||||
|
||||
if (push_undo)
|
||||
gimp_selection_push_undo (selection, _("Select All"));
|
||||
gimp_selection_push_undo (channel, _("Select All"));
|
||||
else
|
||||
gimp_selection_invalidate (selection);
|
||||
gimp_selection_invalidate (channel);
|
||||
|
||||
GIMP_CHANNEL_CLASS (parent_class)->all (channel, FALSE);
|
||||
|
||||
gimp_selection_changed (selection);
|
||||
gimp_selection_changed (channel);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_selection_invert (GimpChannel *channel,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (channel);
|
||||
|
||||
if (push_undo)
|
||||
gimp_selection_push_undo (selection, _("Invert Selection"));
|
||||
gimp_selection_push_undo (channel, _("Invert Selection"));
|
||||
else
|
||||
gimp_selection_invalidate (selection);
|
||||
gimp_selection_invalidate (channel);
|
||||
|
||||
GIMP_CHANNEL_CLASS (parent_class)->invert (channel, FALSE);
|
||||
|
||||
gimp_selection_changed (selection);
|
||||
gimp_selection_changed (channel);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -534,17 +524,15 @@ gimp_selection_border (GimpChannel *channel,
|
|||
gint radius_y,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (channel);
|
||||
|
||||
if (push_undo)
|
||||
gimp_selection_push_undo (selection, _("Border Selection"));
|
||||
gimp_selection_push_undo (channel, _("Border Selection"));
|
||||
else
|
||||
gimp_selection_invalidate (selection);
|
||||
gimp_selection_invalidate (channel);
|
||||
|
||||
GIMP_CHANNEL_CLASS (parent_class)->border (channel, radius_x, radius_y,
|
||||
FALSE);
|
||||
|
||||
gimp_selection_changed (selection);
|
||||
gimp_selection_changed (channel);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -553,17 +541,15 @@ gimp_selection_grow (GimpChannel *channel,
|
|||
gint radius_y,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (channel);
|
||||
|
||||
if (push_undo)
|
||||
gimp_selection_push_undo (selection, _("Grow Selection"));
|
||||
gimp_selection_push_undo (channel, _("Grow Selection"));
|
||||
else
|
||||
gimp_selection_invalidate (selection);
|
||||
gimp_selection_invalidate (channel);
|
||||
|
||||
GIMP_CHANNEL_CLASS (parent_class)->grow (channel, radius_x, radius_y,
|
||||
FALSE);
|
||||
|
||||
gimp_selection_changed (selection);
|
||||
gimp_selection_changed (channel);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -573,21 +559,19 @@ gimp_selection_shrink (GimpChannel *channel,
|
|||
gboolean edge_lock,
|
||||
gboolean push_undo)
|
||||
{
|
||||
GimpSelection *selection = GIMP_SELECTION (channel);
|
||||
|
||||
if (push_undo)
|
||||
gimp_selection_push_undo (selection, _("Shrink Selection"));
|
||||
gimp_selection_push_undo (channel, _("Shrink Selection"));
|
||||
else
|
||||
gimp_selection_invalidate (selection);
|
||||
gimp_selection_invalidate (channel);
|
||||
|
||||
GIMP_CHANNEL_CLASS (parent_class)->shrink (channel, radius_x, radius_y,
|
||||
edge_lock, FALSE);
|
||||
|
||||
gimp_selection_changed (selection);
|
||||
gimp_selection_changed (channel);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_selection_changed (GimpSelection *selection)
|
||||
gimp_selection_changed (GimpChannel *selection)
|
||||
{
|
||||
gimp_image_mask_changed (gimp_item_get_image (GIMP_ITEM (selection)));
|
||||
}
|
||||
|
|
@ -635,8 +619,8 @@ gimp_selection_new (GimpImage *gimage,
|
|||
}
|
||||
|
||||
void
|
||||
gimp_selection_push_undo (GimpSelection *selection,
|
||||
const gchar *undo_desc)
|
||||
gimp_selection_push_undo (GimpChannel *selection,
|
||||
const gchar *undo_desc)
|
||||
{
|
||||
GimpImage *gimage;
|
||||
|
||||
|
|
@ -646,13 +630,13 @@ gimp_selection_push_undo (GimpSelection *selection,
|
|||
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
gimp_image_undo_push_mask (gimage, undo_desc, GIMP_CHANNEL (selection));
|
||||
gimp_image_undo_push_mask (gimage, undo_desc, selection);
|
||||
|
||||
gimp_selection_invalidate (selection);
|
||||
}
|
||||
|
||||
void
|
||||
gimp_selection_invalidate (GimpSelection *selection)
|
||||
gimp_selection_invalidate (GimpChannel *selection)
|
||||
{
|
||||
GimpLayer *layer;
|
||||
GimpImage *gimage;
|
||||
|
|
@ -666,7 +650,7 @@ gimp_selection_invalidate (GimpSelection *selection)
|
|||
/* Turn the current selection off */
|
||||
gimp_image_selection_control (gimage, GIMP_SELECTION_OFF);
|
||||
|
||||
GIMP_CHANNEL (selection)->boundary_known = FALSE;
|
||||
selection->boundary_known = FALSE;
|
||||
|
||||
/* If there is a floating selection, update it's area...
|
||||
* we need to do this since this selection mask can act as an additional
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@ struct _GimpSelectionClass
|
|||
|
||||
GType gimp_selection_get_type (void) G_GNUC_CONST;
|
||||
|
||||
GimpChannel * gimp_selection_new (GimpImage *gimage,
|
||||
gint width,
|
||||
gint height);
|
||||
void gimp_selection_push_undo (GimpSelection *selection,
|
||||
const gchar *undo_desc);
|
||||
void gimp_selection_invalidate (GimpSelection *selection);
|
||||
GimpChannel * gimp_selection_new (GimpImage *gimage,
|
||||
gint width,
|
||||
gint height);
|
||||
void gimp_selection_push_undo (GimpChannel *selection,
|
||||
const gchar *undo_desc);
|
||||
void gimp_selection_invalidate (GimpChannel *selection);
|
||||
|
||||
|
||||
#endif /* __GIMP_SELECTION_H__ */
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include "gui-types.h"
|
||||
|
||||
#include "core/gimp.h"
|
||||
#include "core/gimpchannel.h"
|
||||
#include "core/gimpcontext.h"
|
||||
#include "core/gimpimage.h"
|
||||
#include "core/gimpimage-mask.h"
|
||||
|
|
@ -100,7 +101,7 @@ select_invert_cmd_callback (GtkWidget *widget,
|
|||
GimpImage *gimage;
|
||||
return_if_no_image (gimage, data);
|
||||
|
||||
gimp_image_mask_invert (gimage);
|
||||
gimp_channel_invert (gimp_image_get_mask (gimage), TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -111,7 +112,7 @@ select_all_cmd_callback (GtkWidget *widget,
|
|||
GimpImage *gimage;
|
||||
return_if_no_image (gimage, data);
|
||||
|
||||
gimp_image_mask_all (gimage);
|
||||
gimp_channel_all (gimp_image_get_mask (gimage), TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -122,7 +123,7 @@ select_none_cmd_callback (GtkWidget *widget,
|
|||
GimpImage *gimage;
|
||||
return_if_no_image (gimage, data);
|
||||
|
||||
gimp_image_mask_clear (gimage, NULL);
|
||||
gimp_channel_clear (gimp_image_get_mask (gimage), NULL, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -167,7 +168,7 @@ select_sharpen_cmd_callback (GtkWidget *widget,
|
|||
GimpImage *gimage;
|
||||
return_if_no_image (gimage, data);
|
||||
|
||||
gimp_image_mask_sharpen (gimage);
|
||||
gimp_channel_sharpen (gimp_image_get_mask (gimage), TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -307,7 +308,7 @@ gimp_image_mask_feather_callback (GtkWidget *widget,
|
|||
radius_x *= factor;
|
||||
}
|
||||
|
||||
gimp_image_mask_feather (gimage, radius_x, radius_y);
|
||||
gimp_channel_feather (gimp_image_get_mask (gimage), radius_x, radius_y, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -340,7 +341,7 @@ gimp_image_mask_border_callback (GtkWidget *widget,
|
|||
radius_x *= factor;
|
||||
}
|
||||
|
||||
gimp_image_mask_border (gimage, radius_x, radius_y);
|
||||
gimp_channel_border (gimp_image_get_mask (gimage), radius_x, radius_y, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -373,7 +374,7 @@ gimp_image_mask_grow_callback (GtkWidget *widget,
|
|||
radius_x *= factor;
|
||||
}
|
||||
|
||||
gimp_image_mask_grow (gimage, radius_x, radius_y);
|
||||
gimp_channel_grow (gimp_image_get_mask (gimage), radius_x, radius_y, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
||||
|
|
@ -410,7 +411,7 @@ gimp_image_mask_shrink_callback (GtkWidget *widget,
|
|||
radius_x *= factor;
|
||||
}
|
||||
|
||||
gimp_image_mask_shrink (gimage, radius_x, radius_y,
|
||||
selection_shrink_edge_lock);
|
||||
gimp_channel_shrink (gimp_image_get_mask (gimage), radius_x, radius_y,
|
||||
selection_shrink_edge_lock, TRUE);
|
||||
gimp_image_flush (gimage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@ selection_invert_invoker (Gimp *gimp,
|
|||
success = FALSE;
|
||||
|
||||
if (success)
|
||||
gimp_image_mask_invert (gimage);
|
||||
gimp_channel_invert (gimp_image_get_mask (gimage), TRUE);
|
||||
|
||||
return procedural_db_return_args (&selection_invert_proc, success);
|
||||
}
|
||||
|
|
@ -523,7 +523,7 @@ selection_sharpen_invoker (Gimp *gimp,
|
|||
success = FALSE;
|
||||
|
||||
if (success)
|
||||
gimp_image_mask_sharpen (gimage);
|
||||
gimp_channel_sharpen (gimp_image_get_mask (gimage), TRUE);
|
||||
|
||||
return procedural_db_return_args (&selection_sharpen_proc, success);
|
||||
}
|
||||
|
|
@ -565,7 +565,7 @@ selection_all_invoker (Gimp *gimp,
|
|||
success = FALSE;
|
||||
|
||||
if (success)
|
||||
gimp_image_mask_all (gimage);
|
||||
gimp_channel_all (gimp_image_get_mask (gimage), TRUE);
|
||||
|
||||
return procedural_db_return_args (&selection_all_proc, success);
|
||||
}
|
||||
|
|
@ -654,7 +654,7 @@ selection_feather_invoker (Gimp *gimp,
|
|||
success = FALSE;
|
||||
|
||||
if (success)
|
||||
gimp_image_mask_feather (gimage, radius, radius);
|
||||
gimp_channel_feather (gimp_image_get_mask (gimage), radius, radius, TRUE);
|
||||
|
||||
return procedural_db_return_args (&selection_feather_proc, success);
|
||||
}
|
||||
|
|
@ -706,7 +706,7 @@ selection_border_invoker (Gimp *gimp,
|
|||
success = FALSE;
|
||||
|
||||
if (success)
|
||||
gimp_image_mask_border (gimage, radius, radius);
|
||||
gimp_channel_border (gimp_image_get_mask (gimage), radius, radius, TRUE);
|
||||
|
||||
return procedural_db_return_args (&selection_border_proc, success);
|
||||
}
|
||||
|
|
@ -758,7 +758,7 @@ selection_grow_invoker (Gimp *gimp,
|
|||
success = FALSE;
|
||||
|
||||
if (success)
|
||||
gimp_image_mask_grow (gimage, steps, steps);
|
||||
gimp_channel_grow (gimp_image_get_mask (gimage), steps, steps, TRUE);
|
||||
|
||||
return procedural_db_return_args (&selection_grow_proc, success);
|
||||
}
|
||||
|
|
@ -810,7 +810,7 @@ selection_shrink_invoker (Gimp *gimp,
|
|||
success = FALSE;
|
||||
|
||||
if (success)
|
||||
gimp_image_mask_shrink (gimage, radius, radius, FALSE);
|
||||
gimp_channel_shrink (gimp_image_get_mask (gimage), radius, radius, FALSE, TRUE);
|
||||
|
||||
return procedural_db_return_args (&selection_shrink_proc, success);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@
|
|||
#include "config/gimpcoreconfig.h"
|
||||
|
||||
#include "core/gimp.h"
|
||||
#include "core/gimpchannel.h"
|
||||
#include "core/gimpcontainer.h"
|
||||
#include "core/gimpdrawable.h"
|
||||
#include "core/gimpimage.h"
|
||||
#include "core/gimpimage-mask.h"
|
||||
#include "core/gimpimage-mask-select.h"
|
||||
|
|
@ -286,7 +286,7 @@ gimp_selection_editor_invert_clicked (GtkWidget *widget,
|
|||
{
|
||||
if (editor->gimage)
|
||||
{
|
||||
gimp_image_mask_invert (editor->gimage);
|
||||
gimp_channel_invert (gimp_image_get_mask (editor->gimage), TRUE);
|
||||
gimp_image_flush (editor->gimage);
|
||||
}
|
||||
}
|
||||
|
|
@ -297,7 +297,7 @@ gimp_selection_editor_all_clicked (GtkWidget *widget,
|
|||
{
|
||||
if (editor->gimage)
|
||||
{
|
||||
gimp_image_mask_all (editor->gimage);
|
||||
gimp_channel_all (gimp_image_get_mask (editor->gimage), TRUE);
|
||||
gimp_image_flush (editor->gimage);
|
||||
}
|
||||
}
|
||||
|
|
@ -308,7 +308,7 @@ gimp_selection_editor_none_clicked (GtkWidget *widget,
|
|||
{
|
||||
if (editor->gimage)
|
||||
{
|
||||
gimp_image_mask_clear (editor->gimage, NULL);
|
||||
gimp_channel_clear (gimp_image_get_mask (editor->gimage), NULL, TRUE);
|
||||
gimp_image_flush (editor->gimage);
|
||||
}
|
||||
}
|
||||
|
|
@ -353,9 +353,8 @@ gimp_selection_editor_stroke_clicked (GtkWidget *widget,
|
|||
|
||||
if (gimage)
|
||||
{
|
||||
GimpToolInfo *tool_info;
|
||||
|
||||
tool_info = gimp_context_get_tool (gimp_get_current_context (gimage->gimp));
|
||||
GimpToolInfo *tool_info =
|
||||
gimp_context_get_tool (gimp_get_current_context (gimage->gimp));
|
||||
|
||||
gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (gimage)),
|
||||
gimp_image_active_drawable (gimage),
|
||||
|
|
@ -462,7 +461,6 @@ gimp_selection_preview_button_press (GtkWidget *widget,
|
|||
options->feather,
|
||||
options->feather_radius,
|
||||
options->feather_radius);
|
||||
|
||||
gimp_image_flush (image_editor->gimage);
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -507,7 +505,6 @@ gimp_selection_editor_drop_color (GtkWidget *widget,
|
|||
options->feather,
|
||||
options->feather_radius,
|
||||
options->feather_radius);
|
||||
|
||||
gimp_image_flush (editor->gimage);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ sub selection_simple_proc {
|
|||
|
||||
@inargs = ( &std_image_arg );
|
||||
|
||||
%invoke = ( code => "gimp_image_mask_$op (gimage);" );
|
||||
%invoke = ( code => "gimp_channel_$op (gimp_image_get_mask (gimage), TRUE);" );
|
||||
}
|
||||
|
||||
sub selection_change_proc {
|
||||
|
|
@ -62,7 +62,7 @@ sub selection_change_proc {
|
|||
desc => "\u$arg of $op (in pixels)" }
|
||||
);
|
||||
|
||||
%invoke = ( code => "gimp_image_mask_$op (gimage, $arg, $arg$edge_lock);" );
|
||||
%invoke = ( code => "gimp_channel_$op (gimp_image_get_mask (gimage), $arg, $arg$edge_lock, TRUE);" );
|
||||
}
|
||||
|
||||
# The defs
|
||||
|
|
|
|||
Loading…
Reference in New Issue