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

renamed gimp_item_offsets() to gimp_item_get_offset() and 

2008-11-03  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpitem.[ch]: renamed
	gimp_item_offsets() to gimp_item_get_offset() and
	gimp_item_set_offsets() to gimp_item_set_offset().

	* app/actions/drawable-commands.c
	* app/actions/layers-commands.c
	* app/core/<many>.c
	* app/display/gimpdisplayshell-dnd.c
	* app/display/gimpdisplayshell-preview.c
	* app/display/gimpdisplayshell-transform.c
	* app/display/gimpdisplayshell.c
	* app/paint/gimppaintcore-stroke.c
	* app/paint/gimppaintcore.c
	* app/paint/gimpsourcecore.c
	* app/text/gimptextlayer-xcf.c
	* app/tools/<many>.c
	* app/widgets/gimptoolbox-dnd.c
	* tools/pdbgen/pdb/drawable.pdb
	* tools/pdbgen/pdb/drawable_transform.pdb
	* tools/pdbgen/pdb/selection.pdb
	* tools/pdbgen/pdb/transform_tools.pdb
	* tools/pdbgen/pdb/vectors.pdb: changed accordingly.

	* app/pdb/drawable-cmds.c
	* app/pdb/drawable-transform-cmds.c
	* app/pdb/selection-cmds.c
	* app/pdb/vectors-cmds.c
	* app/pdb/transform-tools-cmds.c: regenerated.


svn path=/trunk/; revision=27529
This commit is contained in:
Michael Natterer 2008-11-02 23:03:29 +00:00 committed by Michael Natterer
parent 594bc84ace
commit 5b68a1d0eb
64 changed files with 181 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ChangeLog
View File

@ -1,3 +1,34 @@
2008-11-03 Michael Natterer <mitch@gimp.org>
* app/core/gimpitem.[ch]: renamed
gimp_item_offsets() to gimp_item_get_offset() and
gimp_item_set_offsets() to gimp_item_set_offset().
* app/actions/drawable-commands.c
* app/actions/layers-commands.c
* app/core/<many>.c
* app/display/gimpdisplayshell-dnd.c
* app/display/gimpdisplayshell-preview.c
* app/display/gimpdisplayshell-transform.c
* app/display/gimpdisplayshell.c
* app/paint/gimppaintcore-stroke.c
* app/paint/gimppaintcore.c
* app/paint/gimpsourcecore.c
* app/text/gimptextlayer-xcf.c
* app/tools/<many>.c
* app/widgets/gimptoolbox-dnd.c
* tools/pdbgen/pdb/drawable.pdb
* tools/pdbgen/pdb/drawable_transform.pdb
* tools/pdbgen/pdb/selection.pdb
* tools/pdbgen/pdb/transform_tools.pdb
* tools/pdbgen/pdb/vectors.pdb: changed accordingly.
* app/pdb/drawable-cmds.c
* app/pdb/drawable-transform-cmds.c
* app/pdb/selection-cmds.c
* app/pdb/vectors-cmds.c
* app/pdb/transform-tools-cmds.c: regenerated.
2008-11-02 Martin Nordholts <martinn@svn.gnome.org>
* app/core/gimpitem.c (gimp_item_set_offsets): New function that

4
app/actions/drawable-commands.c
View File

@ -210,7 +210,7 @@ drawable_flip_cmd_callback (GtkAction *action,
item = GIMP_ITEM (drawable);
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
switch ((GimpOrientationType) value)
{
@ -260,7 +260,7 @@ drawable_rotate_cmd_callback (GtkAction *action,
item = GIMP_ITEM (drawable);
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
center_x = ((gdouble) off_x + (gdouble) gimp_item_width (item) / 2.0);
center_y = ((gdouble) off_y + (gdouble) gimp_item_height (item) / 2.0);

8
app/actions/layers-commands.c
View File

@ -300,7 +300,7 @@ layers_new_last_vals_cmd_callback (GtkAction *action,
{
GimpLayer *template = GIMP_LAYER (GIMP_ACTION (action)->viewable);
gimp_item_offsets (GIMP_ITEM (template), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (template), &off_x, &off_y);
width = gimp_item_width (GIMP_ITEM (template));
height = gimp_item_height (GIMP_ITEM (template));
opacity = gimp_layer_get_opacity (template);
@ -515,7 +515,7 @@ layers_text_to_vectors_cmd_callback (GtkAction *action,
vectors = gimp_text_vectors_new (image, GIMP_TEXT_LAYER (layer)->text);
gimp_item_offsets (GIMP_ITEM (layer), &x, &y);
gimp_item_get_offset (GIMP_ITEM (layer), &x, &y);
gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
gimp_image_add_vectors (image, vectors, -1, TRUE);
@ -641,7 +641,7 @@ layers_crop_cmd_callback (GtkAction *action,
return;
}
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
off_x -= x1;
off_y -= y1;
@ -783,7 +783,7 @@ layers_mask_to_selection_cmd_callback (GtkAction *action,
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (mask), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (mask), &off_x, &off_y);
gimp_channel_select_channel (gimp_image_get_mask (image),
_("Layer Mask to Selection"),

2
app/core/gimp-edit.c
View File

@ -203,7 +203,7 @@ gimp_edit_paste (GimpImage *image,
gint paste_width, paste_height;
gboolean have_mask;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
have_mask = gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
if (! have_mask &&

6
app/core/gimpchannel-select.c
View File

@ -429,7 +429,7 @@ gimp_channel_select_alpha (GimpChannel *channel,
gimp_channel_all (add_on, FALSE);
}
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_channel_select_channel (channel, _("Alpha to Selection"), add_on,
off_x, off_y,
@ -515,7 +515,7 @@ gimp_channel_select_fuzzy (GimpChannel *channel,
x, y);
if (! sample_merged)
gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_channel_select_channel (channel, C_("command", "Fuzzy Select"),
add_on, add_on_x, add_on_y,
@ -562,7 +562,7 @@ gimp_channel_select_by_color (GimpChannel *channel,
color);
if (! sample_merged)
gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_channel_select_channel (channel, C_("command", "Select by Color"),
add_on, add_on_x, add_on_y,

2
app/core/gimpchannel.c
View File

@ -721,7 +721,7 @@ gimp_channel_stroke (GimpItem *item,
return FALSE;
}
gimp_item_offsets (GIMP_ITEM (channel), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (channel), &offset_x, &offset_y);
switch (stroke_options->method)
{

2
app/core/gimpdrawable-blend.c
View File

@ -592,7 +592,7 @@ gradient_precalc_shapeburst (GimpImage *image,
gint offx, offy;
gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
gimp_item_offsets (GIMP_ITEM (drawable), &offx, &offy);
gimp_item_get_offset (GIMP_ITEM (drawable), &offx, &offy);
pixel_region_init (&maskR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
x1 + offx, y1 + offy, (x2 - x1), (y2 - y1), FALSE);

4
app/core/gimpdrawable-bucket-fill.c
View File

@ -200,7 +200,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
gint off_y = 0;
if (! sample_merged)
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_channel_combine_mask (mask, gimp_image_get_mask (image),
GIMP_CHANNEL_OP_INTERSECT,
@ -218,7 +218,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
item = GIMP_ITEM (drawable);
/* Limit the channel bounds to the drawable's extents */
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
x1 = CLAMP (x1, off_x, (off_x + gimp_item_width (item)));
y1 = CLAMP (y1, off_y, (off_y + gimp_item_height (item)));

4
app/core/gimpdrawable-combine.c
View File

@ -79,7 +79,7 @@ gimp_drawable_real_apply_region (GimpDrawable *drawable,
}
/* get the layer offsets */
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
/* make sure the image application coordinates are within drawable bounds */
x1 = CLAMP (x, 0, gimp_item_width (item));
@ -228,7 +228,7 @@ gimp_drawable_real_replace_region (GimpDrawable *drawable,
}
/* get the layer offsets */
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
/* make sure the image application coordinates are within drawable bounds */
x1 = CLAMP (x, 0, gimp_item_width (item));

2
app/core/gimpdrawable-foreground-extract.c
View File

@ -94,7 +94,7 @@ gimp_drawable_foreground_extract_siox_init (GimpDrawable *drawable,
if (gimp_image_base_type (image) == GIMP_INDEXED)
colormap = gimp_image_get_colormap (image);
gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
intersect = gimp_rectangle_intersect (offset_x, offset_y,
gimp_item_width (GIMP_ITEM (drawable)),

2
app/core/gimpdrawable-histogram.c
View File

@ -62,7 +62,7 @@ gimp_drawable_calculate_histogram (GimpDrawable *drawable,
image = gimp_item_get_image (GIMP_ITEM (drawable));
sel_mask = gimp_image_get_mask (image);
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
pixel_region_init (&mask,
gimp_drawable_get_tiles (GIMP_DRAWABLE (sel_mask)),
x1 + off_x, y1 + off_y, (x2 - x1), (y2 - y1), FALSE);

2
app/core/gimpdrawable-stroke.c
View File

@ -379,7 +379,7 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
color_region (&maskPR, bg);
/* render the stroke into it */
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_scan_convert_render (scan_convert, mask,
x + off_x, y + off_y,

12
app/core/gimpdrawable.c
View File

@ -555,7 +555,7 @@ gimp_drawable_flip (GimpItem *item,
gint off_x, off_y;
gint old_off_x, old_off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
tile_manager_get_offsets (gimp_drawable_get_tiles (drawable),
&old_off_x, &old_off_y);
@ -590,7 +590,7 @@ gimp_drawable_rotate (GimpItem *item,
gint off_x, off_y;
gint old_off_x, old_off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
tile_manager_get_offsets (gimp_drawable_get_tiles (drawable),
&old_off_x, &old_off_y);
@ -627,7 +627,7 @@ gimp_drawable_transform (GimpItem *item,
gint off_x, off_y;
gint old_off_x, old_off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
tile_manager_get_offsets (gimp_drawable_get_tiles (drawable),
&old_off_x, &old_off_y);
@ -1057,7 +1057,7 @@ gimp_drawable_set_tiles (GimpDrawable *drawable,
if (! gimp_item_is_attached (GIMP_ITEM (drawable)))
push_undo = FALSE;
gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_drawable_set_tiles_full (drawable, push_undo, undo_desc, tiles,
gimp_drawable_type (drawable),
@ -1340,7 +1340,7 @@ gimp_drawable_mask_bounds (GimpDrawable *drawable,
{
gint off_x, off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
tmp_x1 = CLAMP (tmp_x1 - off_x, 0, gimp_item_width (item));
tmp_y1 = CLAMP (tmp_y1 - off_y, 0, gimp_item_height (item));
@ -1395,7 +1395,7 @@ gimp_drawable_mask_intersect (GimpDrawable *drawable,
{
gint off_x, off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
retval = gimp_rectangle_intersect (tmp_x - off_x, tmp_y - off_y,
tmp_width - tmp_x, tmp_height - tmp_y,

4
app/core/gimpdrawablestack.c
View File

@ -396,7 +396,7 @@ gimp_drawable_stack_drawable_update (GimpItem *item,
gint offset_x;
gint offset_y;
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
gimp_drawable_stack_update (stack,
x + offset_x, y + offset_y,
@ -411,7 +411,7 @@ gimp_drawable_stack_drawable_visible (GimpItem *item,
gint offset_x;
gint offset_y;
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
gimp_drawable_stack_update (stack,
offset_x, offset_y,

4
app/core/gimpimage-arrange.c
View File

@ -259,7 +259,7 @@ compute_offset (GObject *object,
/* fall back on using the offsets instead */
GimpItem *item = GIMP_ITEM (object);
gimp_item_offsets (item, &object_offset_x, &object_offset_y);
gimp_item_get_offset (item, &object_offset_x, &object_offset_y);
object_height = gimp_item_height (item);
object_width = gimp_item_width (item);
}
@ -293,7 +293,7 @@ compute_offset (GObject *object,
}
else
{
gimp_item_offsets (item, &object_offset_x, &object_offset_y);
gimp_item_get_offset (item, &object_offset_x, &object_offset_y);
object_height = gimp_item_height (item);
object_width = gimp_item_width (item);
}

16
app/core/gimpimage-convert.c
View File

@ -1173,7 +1173,7 @@ generate_histogram_rgb (CFHistogram histogram,
gint count = 0;
gboolean has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
/* g_printerr ("col_limit = %d, nfc = %d\n", col_limit, num_found_cols); */
@ -2770,7 +2770,7 @@ median_cut_pass2_no_dither_gray (QuantizeObj *quantobj,
gint offsetx, offsety;
gpointer pr;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
@ -2867,7 +2867,7 @@ median_cut_pass2_fixed_dither_gray (QuantizeObj *quantobj,
gint offsetx, offsety;
gpointer pr;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
@ -3018,7 +3018,7 @@ median_cut_pass2_no_dither_rgb (QuantizeObj *quantobj,
gint nth_layer = quantobj->nth_layer;
gint n_layers = quantobj->n_layers;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
/* In the case of web/mono palettes, we actually force
* grayscale drawables through the rgb pass2 functions
@ -3143,7 +3143,7 @@ median_cut_pass2_fixed_dither_rgb (QuantizeObj *quantobj,
gint nth_layer = quantobj->nth_layer;
gint n_layers = quantobj->n_layers;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
/* In the case of web/mono palettes, we actually force
* grayscale drawables through the rgb pass2 functions
@ -3346,7 +3346,7 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
gint lastblue = -1;
gint offsetx, offsety;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
@ -3560,7 +3560,7 @@ median_cut_pass2_fs_dither_gray (QuantizeObj *quantobj,
gint width, height;
gulong *index_used_count = quantobj->index_used_count;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
@ -3820,7 +3820,7 @@ median_cut_pass2_fs_dither_rgb (QuantizeObj *quantobj,
gint nth_layer = quantobj->nth_layer;
gint n_layers = quantobj->n_layers;
gimp_item_offsets (GIMP_ITEM (layer), &offsetx, &offsety);
gimp_item_get_offset (GIMP_ITEM (layer), &offsetx, &offsety);
/* In the case of web/mono palettes, we actually force
* grayscale drawables through the rgb pass2 functions

4
app/core/gimpimage-crop.c
View File

@ -110,7 +110,7 @@ gimp_image_crop (GimpImage *image,
layer = gimp_image_get_active_layer (image);
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
off_x -= x1;
off_y -= y1;
@ -185,7 +185,7 @@ gimp_image_crop (GimpImage *image,
gint off_x, off_y;
gint lx1, ly1, lx2, ly2;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
lx1 = CLAMP (off_x, 0, gimp_image_get_width (image));
ly1 = CLAMP (off_y, 0, gimp_image_get_height (image));

4
app/core/gimpimage-merge.c
View File

@ -344,7 +344,7 @@ gimp_image_merge_layers (GimpImage *image,
{
layer = merge_list->data;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
switch (merge_type)
{
@ -525,7 +525,7 @@ gimp_image_merge_layers (GimpImage *image,
return NULL;
}
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
x3 = CLAMP (off_x, x1, x2);
y3 = CLAMP (off_y, y1, y2);

2
app/core/gimpimage-pick-color.c
View File

@ -65,7 +65,7 @@ gimp_image_pick_color (GimpImage *image,
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x -= off_x;
y -= off_y;

2
app/core/gimpimage-resize.c
View File

@ -154,7 +154,7 @@ gimp_image_resize_with_layers (GimpImage *image,
gint old_offset_x;
gint old_offset_y;
gimp_item_offsets (item, &old_offset_x, &old_offset_y);
gimp_item_get_offset (item, &old_offset_x, &old_offset_y);
gimp_item_translate (item, offset_x, offset_y, TRUE);

4
app/core/gimpimage-rotate.c
View File

@ -175,7 +175,7 @@ gimp_image_rotate (GimpImage *image,
gint off_x;
gint off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
gimp_item_rotate (item, context, rotate_type, center_x, center_y, FALSE);
@ -256,7 +256,7 @@ gimp_image_rotate_item_offset (GimpImage *image,
return;
}
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
x -= off_x;
y -= off_y;

6
app/core/gimpimage.c
View File

@ -3065,7 +3065,7 @@ gimp_image_add_layers (GimpImage *image,
GimpItem *item = GIMP_ITEM (list->data);
gint off_x, off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
layers_x = MIN (layers_x, off_x);
layers_y = MIN (layers_y, off_y);
@ -3687,7 +3687,7 @@ gimp_image_pick_correlate_layer (const GimpImage *image,
GimpLayer *layer = list->data;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
if (gimp_pickable_get_opacity_at (GIMP_PICKABLE (layer),
x - off_x, y - off_y) > 63)
@ -3729,7 +3729,7 @@ gimp_image_coords_in_active_pickable (GimpImage *image,
gint off_x, off_y;
gint d_x, d_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
d_x = x - off_x;
d_y = y - off_y;

14
app/core/gimpitem.c
View File

@ -693,7 +693,7 @@ gimp_item_height (const GimpItem *item)
}
/**
* gimp_item_offsets:
* gimp_item_get_offsets:
* @item: The #GimpItem to check.
* @offset_x: Return location for the item's X offset.
* @offset_y: Return location for the item's Y offset.
@ -701,9 +701,9 @@ gimp_item_height (const GimpItem *item)
* Reveals the X and Y offsets of the item.
*/
void
gimp_item_offsets (const GimpItem *item,
gint *offset_x,
gint *offset_y)
gimp_item_get_offset (const GimpItem *item,
gint *offset_x,
gint *offset_y)
{
g_return_if_fail (GIMP_IS_ITEM (item));
@ -712,9 +712,9 @@ gimp_item_offsets (const GimpItem *item,
}
void
gimp_item_set_offsets (GimpItem *item,
gint offset_x,
gint offset_y)
gimp_item_set_offset (GimpItem *item,
gint offset_x,
gint offset_y)
{
g_return_if_fail (GIMP_IS_ITEM (item));

5
app/core/gimpitem.h
View File

@ -159,10 +159,11 @@ gboolean gimp_item_rename (GimpItem *item,
gint gimp_item_width (const GimpItem *item);
gint gimp_item_height (const GimpItem *item);
void gimp_item_offsets (const GimpItem *item,
void gimp_item_get_offset (const GimpItem *item,
gint *offset_x,
gint *offset_y);
void gimp_item_set_offsets (GimpItem *item,
void gimp_item_set_offset (GimpItem *item,
gint offset_x,
gint offset_y);

8
app/core/gimpitempropundo.c
View File

@ -115,9 +115,9 @@ gimp_item_prop_undo_constructor (GType type,
break;
case GIMP_UNDO_ITEM_DISPLACE:
gimp_item_offsets (item,
&item_prop_undo->offset_x,
&item_prop_undo->offset_y);
gimp_item_get_offset (item,
&item_prop_undo->offset_x,
&item_prop_undo->offset_y);
break;
case GIMP_UNDO_ITEM_VISIBILITY:
@ -225,7 +225,7 @@ gimp_item_prop_undo_pop (GimpUndo *undo,
gint offset_x;
gint offset_y;
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
gimp_item_translate (item,
item_prop_undo->offset_x - offset_x,

8
app/core/gimplayer-floating-sel.c
View File

@ -278,7 +278,7 @@ floating_sel_store (GimpLayer *layer,
* drawable that this floating selection obscures. We do this so
* that it will be possible to subsequently restore the drawable's area
*/
gimp_item_offsets (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
gimp_item_get_offset (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
/* Find the minimum area we need to uncover -- in image space */
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
@ -328,7 +328,7 @@ floating_sel_restore (GimpLayer *layer,
*/
/* Find the minimum area we need to uncover -- in image space */
gimp_item_offsets (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
gimp_item_get_offset (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
y1 = MAX (GIMP_ITEM (layer)->offset_y, offy);
@ -437,7 +437,7 @@ floating_sel_composite (GimpLayer *layer,
gint x1, y1, x2, y2;
/* Find the minimum area we need to composite -- in image space */
gimp_item_offsets (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
gimp_item_get_offset (GIMP_ITEM (layer->fs.drawable), &offx, &offy);
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
y1 = MAX (GIMP_ITEM (layer)->offset_y, offy);
@ -514,7 +514,7 @@ floating_sel_boundary (GimpLayer *layer,
width = gimp_item_width (GIMP_ITEM (layer));
height = gimp_item_height (GIMP_ITEM (layer));
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
if (layer->fs.segs)
g_free (layer->fs.segs);

2
app/core/gimplayer.c
View File

@ -1825,7 +1825,7 @@ gimp_layer_resize_to_image (GimpLayer *layer,
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
_("Layer to Image Size"));
gimp_item_offsets (GIMP_ITEM (layer), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
gimp_item_resize (GIMP_ITEM (layer), context,
gimp_image_get_width (image),
gimp_image_get_height (image),

2
app/core/gimppalette-import.c
View File

@ -473,7 +473,7 @@ gimp_palette_import_from_drawable (GimpDrawable *drawable,
height = gimp_item_height (GIMP_ITEM (drawable));
}
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
colors =
gimp_palette_import_extract (gimp_item_get_image (GIMP_ITEM (drawable)),

6
app/core/gimpprojection-construct.c
View File

@ -117,7 +117,7 @@ gimp_projection_construct (GimpProjection *proj,
gint xoff;
gint yoff;
gimp_item_offsets (GIMP_ITEM (layer), &xoff, &yoff);
gimp_item_get_offset (GIMP_ITEM (layer), &xoff, &yoff);
if (xoff == 0 && yoff == 0)
{
@ -239,7 +239,7 @@ gimp_projection_construct_layers (GimpProjection *proj,
layer = list->data;
mask = gimp_layer_get_mask (layer);
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
x1 = CLAMP (off_x, x, x + w);
y1 = CLAMP (off_y, y, y + h);
@ -393,7 +393,7 @@ gimp_projection_initialize (GimpProjection *proj,
GimpItem *item = list->data;
gint off_x, off_y;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
if (gimp_item_get_visible (item) &&
! gimp_drawable_has_alpha (GIMP_DRAWABLE (item)) &&

4
app/core/gimpselection.c
View File

@ -376,7 +376,7 @@ gimp_selection_boundary (GimpChannel *channel,
gint x2, y2;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
x1 = CLAMP (off_x, 0, gimp_image_get_width (image));
y1 = CLAMP (off_y, 0, gimp_image_get_height (image));
@ -717,7 +717,7 @@ gimp_selection_extract (GimpChannel *selection,
gimp_drawable_push_undo (GIMP_DRAWABLE (pickable), NULL,
x1, y1, x2, y2, NULL, FALSE);
gimp_item_offsets (GIMP_ITEM (pickable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (pickable), &off_x, &off_y);
colormap = gimp_drawable_get_colormap (GIMP_DRAWABLE (pickable));
}
else

2
app/display/gimpdisplayshell-dnd.c
View File

@ -171,7 +171,7 @@ gimp_display_shell_dnd_position_item (GimpDisplayShell *shell,
gimp_display_shell_untransform_viewport (shell, &x, &y, &width, &height);
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
off_x = x + (width - gimp_item_width (item)) / 2 - off_x;
off_y = y + (height - gimp_item_height (item)) / 2 - off_y;

2
app/display/gimpdisplayshell-preview.c
View File

@ -207,7 +207,7 @@ gimp_display_shell_preview_transform (GimpDisplayShell *shell)
{
mask = gimp_image_get_mask (shell->display->image);
gimp_item_offsets (GIMP_ITEM (tool->drawable),
gimp_item_get_offset (GIMP_ITEM (tool->drawable),
&mask_offx, &mask_offy);
}

14
app/display/gimpdisplayshell-transform.c
View File

@ -128,7 +128,7 @@ gimp_display_shell_transform_xy (const GimpDisplayShell *shell,
GimpItem *item;
item = GIMP_ITEM (gimp_image_get_active_drawable (shell->display->image));
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
x += offset_x;
y += offset_y;
@ -190,7 +190,7 @@ gimp_display_shell_untransform_xy (const GimpDisplayShell *shell,
GimpItem *item;
item = GIMP_ITEM (gimp_image_get_active_drawable (shell->display->image));
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
}
gimp_display_shell_scroll_get_scaled_viewport_offset (shell,
@ -247,7 +247,7 @@ gimp_display_shell_transform_xy_f (const GimpDisplayShell *shell,
GimpItem *item;
item = GIMP_ITEM (gimp_image_get_active_drawable (shell->display->image));
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
}
gimp_display_shell_scroll_get_scaled_viewport_offset (shell,
@ -294,7 +294,7 @@ gimp_display_shell_untransform_xy_f (const GimpDisplayShell *shell,
GimpItem *item;
item = GIMP_ITEM (gimp_image_get_active_drawable (shell->display->image));
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
}
gimp_display_shell_scroll_get_scaled_viewport_offset (shell,
@ -335,7 +335,7 @@ gimp_display_shell_transform_points (const GimpDisplayShell *shell,
GimpItem *item;
item = GIMP_ITEM (gimp_image_get_active_drawable (shell->display->image));
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
}
for (i = 0; i < n_points ; i++)
@ -389,7 +389,7 @@ gimp_display_shell_transform_coords (const GimpDisplayShell *shell,
GimpItem *item;
item = GIMP_ITEM (gimp_image_get_active_drawable (shell->display->image));
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
}
for (i = 0; i < n_coords ; i++)
@ -443,7 +443,7 @@ gimp_display_shell_transform_segments (const GimpDisplayShell *shell,
GimpItem *item;
item = GIMP_ITEM (gimp_image_get_active_drawable (shell->display->image));
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
}
for (i = 0; i < n_segs ; i++)

2
app/display/gimpdisplayshell.c
View File

@ -1631,7 +1631,7 @@ gimp_display_shell_mask_bounds (GimpDisplayShell *shell,
gint off_x;
gint off_y;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
if (! gimp_channel_bounds (gimp_image_get_mask (shell->display->image),
x1, y1, x2, y2))

6
app/paint/gimppaintcore-stroke.c
View File

@ -128,7 +128,7 @@ gimp_paint_core_stroke_boundary (GimpPaintCore *core,
if (n_stroke_segs == 0)
return TRUE;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
off_x -= offset_x;
off_y -= offset_y;
@ -246,8 +246,8 @@ gimp_paint_core_stroke_vectors (GimpPaintCore *core,
g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
gimp_item_offsets (GIMP_ITEM (vectors), &vectors_off_x, &vectors_off_y);
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (vectors), &vectors_off_x, &vectors_off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
off_x -= vectors_off_x;
off_y -= vectors_off_y;

2
app/paint/gimppaintcore.c
View File

@ -805,7 +805,7 @@ gimp_paint_core_paste (GimpPaintCore *core,
gint off_x;
gint off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_paint_core_validate_saved_proj_tiles (core,
GIMP_PICKABLE (projection),

2
app/paint/gimpsourcecore.c
View File

@ -370,7 +370,7 @@ gimp_source_core_motion (GimpSourceCore *source_core,
src_pickable = GIMP_PICKABLE (gimp_image_get_projection (src_image));
gimp_item_offsets (GIMP_ITEM (source_core->src_drawable),
gimp_item_get_offset (GIMP_ITEM (source_core->src_drawable),
&off_x, &off_y);
src_offset_x += off_x;

2
app/pdb/drawable-cmds.c
View File

@ -469,7 +469,7 @@ drawable_offsets_invoker (GimpProcedure *procedure,
if (success)
{
gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
}
return_vals = gimp_procedure_get_return_values (procedure, success,

28
app/pdb/drawable-transform-cmds.c
View File

@ -134,7 +134,7 @@ drawable_transform_flip_invoker (GimpProcedure *procedure,
GimpMatrix3 matrix;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -206,7 +206,7 @@ drawable_transform_flip_default_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -294,7 +294,7 @@ drawable_transform_perspective_invoker (GimpProcedure *procedure,
GimpMatrix3 matrix;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -376,7 +376,7 @@ drawable_transform_perspective_default_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -507,7 +507,7 @@ drawable_transform_rotate_invoker (GimpProcedure *procedure,
GimpMatrix3 matrix;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -583,7 +583,7 @@ drawable_transform_rotate_default_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -667,7 +667,7 @@ drawable_transform_scale_invoker (GimpProcedure *procedure,
GimpMatrix3 matrix;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -740,7 +740,7 @@ drawable_transform_scale_default_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -817,7 +817,7 @@ drawable_transform_shear_invoker (GimpProcedure *procedure,
GimpMatrix3 matrix;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -886,7 +886,7 @@ drawable_transform_shear_default_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -973,7 +973,7 @@ drawable_transform_2d_invoker (GimpProcedure *procedure,
GimpMatrix3 matrix;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -1053,7 +1053,7 @@ drawable_transform_2d_default_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -1145,7 +1145,7 @@ drawable_transform_matrix_invoker (GimpProcedure *procedure,
GimpMatrix3 matrix;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -1233,7 +1233,7 @@ drawable_transform_matrix_default_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;

4
app/pdb/selection-cmds.c
View File

@ -448,7 +448,7 @@ selection_load_invoker (GimpProcedure *procedure,
gint off_x, off_y;
image = gimp_item_get_image (GIMP_ITEM (channel));
gimp_item_offsets (GIMP_ITEM (channel), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (channel), &off_x, &off_y);
gimp_channel_select_channel (gimp_image_get_mask (image),
_("Channel to Selection"),
@ -515,7 +515,7 @@ selection_combine_invoker (GimpProcedure *procedure,
gint off_x, off_y;
image = gimp_item_get_image (GIMP_ITEM (channel));
gimp_item_offsets (GIMP_ITEM (channel), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (channel), &off_x, &off_y);
gimp_channel_select_channel (gimp_image_get_mask (image),
_("Channel to Selection"),

8
app/pdb/transform-tools-cmds.c
View File

@ -127,7 +127,7 @@ perspective_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -197,7 +197,7 @@ rotate_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -273,7 +273,7 @@ scale_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -344,7 +344,7 @@ shear_invoker (GimpProcedure *procedure,
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;

2
app/pdb/vectors-cmds.c
View File

@ -128,7 +128,7 @@ vectors_new_from_text_layer_invoker (GimpProcedure *procedure,
vectors = gimp_text_vectors_new (image,
gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)));
gimp_item_offsets (GIMP_ITEM (layer), &x, &y);
gimp_item_get_offset (GIMP_ITEM (layer), &x, &y);
gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
}
else

2
app/text/gimptextlayer-xcf.c
View File

@ -205,7 +205,7 @@ gimp_text_layer_from_layer (GimpLayer *layer,
item->width = gimp_item_width (GIMP_ITEM (layer));
item->height = gimp_item_height (GIMP_ITEM (layer));
gimp_item_offsets (GIMP_ITEM (layer), &item->offset_x, &item->offset_y);
gimp_item_get_offset (GIMP_ITEM (layer), &item->offset_x, &item->offset_y);
gimp_item_set_visible (item, gimp_item_get_visible (GIMP_ITEM (layer)), FALSE);
gimp_item_set_linked (item, gimp_item_get_linked (GIMP_ITEM (layer)), FALSE);

6
app/tools/gimpaligntool.c
View File

@ -409,7 +409,7 @@ gimp_align_tool_button_release (GimpTool *tool,
if (! gimp_item_get_visible (GIMP_ITEM (layer)))
continue;
gimp_item_offsets (GIMP_ITEM (layer), &x0, &y0);
gimp_item_get_offset (GIMP_ITEM (layer), &x0, &y0);
x1 = x0 + gimp_item_width (GIMP_ITEM (layer));
y1 = y0 + gimp_item_height (GIMP_ITEM (layer));
@ -679,7 +679,7 @@ gimp_align_tool_draw (GimpDrawTool *draw_tool)
}
else
{
gimp_item_offsets (item, &x, &y);
gimp_item_get_offset (item, &x, &y);
w = gimp_item_width (item);
h = gimp_item_height (item);
@ -1131,7 +1131,7 @@ select_layer_by_coords (GimpImage *image,
if (! gimp_item_get_visible (GIMP_ITEM (layer)))
continue;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
width = gimp_item_width (GIMP_ITEM (layer));
height = gimp_item_height (GIMP_ITEM (layer));

2
app/tools/gimpblendtool.c
View File

@ -223,7 +223,7 @@ gimp_blend_tool_button_release (GimpTool *tool,
progress = gimp_progress_start (GIMP_PROGRESS (display),
_("Blending"), FALSE);
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_drawable_blend (drawable,
context,

2
app/tools/gimpbucketfilltool.c
View File

@ -139,7 +139,7 @@ gimp_bucket_fill_tool_button_release (GimpTool *tool,
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x -= off_x;
y -= off_y;

2
app/tools/gimpbycolorselecttool.c
View File

@ -113,7 +113,7 @@ gimp_by_color_select_tool_get_mask (GimpRegionSelectTool *region_select,
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x -= off_x;
y -= off_y;

4
app/tools/gimpcolortool.c
View File

@ -267,7 +267,7 @@ gimp_color_tool_button_press (GimpTool *tool,
gint off_x, off_y;
/* Keep the coordinates of the target */
gimp_item_offsets (GIMP_ITEM (tool->drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y);
color_tool->center_x = coords->x - off_x;
color_tool->center_y = coords->y - off_y;
@ -449,7 +449,7 @@ gimp_color_tool_motion (GimpTool *tool,
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
gimp_item_offsets (GIMP_ITEM (tool->drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y);
color_tool->center_x = coords->x - off_x;
color_tool->center_y = coords->y - off_y;

12
app/tools/gimpeditselectiontool.c
View File

@ -254,7 +254,7 @@ gimp_edit_selection_tool_start (GimpTool *parent_tool,
GIMP_UNDO_GROUP_ITEM_DISPLACE,
undo_desc);
gimp_item_offsets (active_item, &off_x, &off_y);
gimp_item_get_offset (active_item, &off_x, &off_y);
edit_select->x = edit_select->origx = coords->x - off_x;
edit_select->y = edit_select->origy = coords->y - off_y;
@ -369,7 +369,7 @@ gimp_edit_selection_tool_start (GimpTool *parent_tool,
gint x3, y3;
gint x4, y4;
gimp_item_offsets (item, &x3, &y3);
gimp_item_get_offset (item, &x3, &y3);
x4 = x3 + gimp_item_width (item);
y4 = y3 + gimp_item_height (item);
@ -599,7 +599,7 @@ gimp_edit_selection_tool_update_motion (GimpEditSelectionTool *edit_select,
active_item = gimp_edit_selection_tool_get_active_item (edit_select,
display->image);
gimp_item_offsets (active_item, &off_x, &off_y);
gimp_item_get_offset (active_item, &off_x, &off_y);
if (edit_select->constrain)
{
@ -804,7 +804,7 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool)
}
else
{
gimp_item_offsets (active_item, &off_x, &off_y);
gimp_item_get_offset (active_item, &off_x, &off_y);
}
if (! floating_sel && edit_select->segs_in)
@ -857,7 +857,7 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool)
active_item = GIMP_ITEM (gimp_image_get_active_layer (display->image));
gimp_item_offsets (active_item, &x1, &y1);
gimp_item_get_offset (active_item, &x1, &y1);
x2 = x1 + gimp_item_width (active_item);
y2 = y1 + gimp_item_height (active_item);
@ -880,7 +880,7 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool)
gint x3, y3;
gint x4, y4;
gimp_item_offsets (item, &x3, &y3);
gimp_item_get_offset (item, &x3, &y3);
x4 = x3 + gimp_item_width (item);
y4 = y3 + gimp_item_height (item);

2
app/tools/gimpfuzzyselecttool.c
View File

@ -110,7 +110,7 @@ gimp_fuzzy_select_tool_get_mask (GimpRegionSelectTool *region_select,
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x -= off_x;
y -= off_y;

4
app/tools/gimpimagemaptool.c
View File

@ -415,7 +415,7 @@ gimp_image_map_tool_pick_color (GimpColorTool *color_tool,
GimpImageMapTool *tool = GIMP_IMAGE_MAP_TOOL (color_tool);
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (tool->drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (tool->drawable), &off_x, &off_y);
*sample_type = gimp_drawable_type (tool->drawable);
@ -441,7 +441,7 @@ gimp_image_map_tool_map (GimpImageMapTool *tool)
gimp_display_shell_untransform_viewport (shell, &x, &y, &w, &h);
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_get_offset (item, &off_x, &off_y);
gimp_rectangle_intersect (x, y, w, h,
off_x,

6
app/tools/gimppainttool.c
View File

@ -302,7 +302,7 @@ gimp_paint_tool_button_press (GimpTool *tool,
curr_coords = *coords;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
curr_coords.x -= off_x;
curr_coords.y -= off_y;
@ -454,7 +454,7 @@ gimp_paint_tool_motion (GimpTool *tool,
core->cur_coords = *coords;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
core->cur_coords.x -= off_x;
core->cur_coords.y -= off_y;
@ -589,7 +589,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
core->cur_coords = *coords;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
core->cur_coords.x -= off_x;
core->cur_coords.y -= off_y;

4
app/tools/gimpperspectiveclonetool.c
View File

@ -788,8 +788,8 @@ gimp_perspective_clone_tool_draw (GimpDrawTool *draw_tool)
gint off_x;
gint off_y;
gimp_item_offsets (GIMP_ITEM (source_core->src_drawable),
&off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (source_core->src_drawable),
&off_x, &off_y);
tmp_display = draw_tool->display;
draw_tool->display = clone_tool->src_display;

4
app/tools/gimprectangletool.c
View File

@ -724,7 +724,7 @@ gimp_rectangle_tool_frame_item (GimpRectangleTool *rect_tool,
width = gimp_item_width (item);
height = gimp_item_height (item);
gimp_item_offsets (item, &offset_x, &offset_y);
gimp_item_get_offset (item, &offset_x, &offset_y);
gimp_draw_tool_pause (GIMP_DRAW_TOOL (rect_tool));
@ -4102,7 +4102,7 @@ gimp_rectangle_tool_get_constraints (GimpRectangleTool *rect_tool,
{
GimpItem *item = GIMP_ITEM (tool->drawable);
gimp_item_offsets (item, min_x, min_y);
gimp_item_get_offset (item, min_x, min_y);
*max_x = *min_x + gimp_item_width (item);
*max_y = *min_y + gimp_item_height (item);
}

2
app/tools/gimpregionselecttool.c
View File

@ -220,7 +220,7 @@ gimp_region_select_tool_button_release (GimpTool *tool,
drawable = gimp_image_get_active_drawable (display->image);
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
}
gimp_channel_select_channel (gimp_image_get_mask (display->image),

2
app/tools/gimpsourcetool.c
View File

@ -375,7 +375,7 @@ gimp_source_tool_draw (GimpDrawTool *draw_tool)
draw_tool->display = source_tool->src_display;
gimp_item_offsets (GIMP_ITEM (source->src_drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (source->src_drawable), &off_x, &off_y);
if (source_tool->show_source_outline)
gimp_brush_tool_draw_brush (GIMP_BRUSH_TOOL (source_tool),

2
app/tools/gimptexttool.c
View File

@ -2396,7 +2396,7 @@ gimp_text_tool_create_vectors (GimpTextTool *text_tool)
{
gint x, y;
gimp_item_offsets (GIMP_ITEM (text_tool->layer), &x, &y);
gimp_item_get_offset (GIMP_ITEM (text_tool->layer), &x, &y);
gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
}

2
app/tools/gimptransformtool.c
View File

@ -1500,7 +1500,7 @@ gimp_transform_tool_bounds (GimpTransformTool *tr_tool,
drawable = gimp_image_get_active_drawable (display->image);
gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_drawable_mask_bounds (drawable,
&tr_tool->x1, &tr_tool->y1,

2
app/widgets/gimptoolbox-dnd.c
View File

@ -219,7 +219,7 @@ gimp_toolbox_drop_drawable (GtkWidget *widget,
gimp_object_set_name (GIMP_OBJECT (new_layer),
gimp_object_get_name (GIMP_OBJECT (drawable)));
gimp_item_offsets (GIMP_ITEM (new_layer), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (new_layer), &off_x, &off_y);
gimp_item_translate (GIMP_ITEM (new_layer), -off_x, -off_y, FALSE);
gimp_item_set_visible (GIMP_ITEM (new_layer), TRUE, FALSE);
gimp_item_set_linked (GIMP_ITEM (new_layer), FALSE, FALSE);

2
tools/pdbgen/pdb/drawable.pdb
View File

@ -596,7 +596,7 @@ HELP
%invoke = (
code => <<'CODE'
{
gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
}
CODE
);

4
tools/pdbgen/pdb/drawable_transform.pdb
View File

@ -44,7 +44,7 @@ sub transform_invoke {
GimpMatrix3 matrix;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -91,7 +91,7 @@ sub transform_default_invoke {
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;

4
tools/pdbgen/pdb/selection.pdb
View File

@ -465,7 +465,7 @@ HELP
gint off_x, off_y;
image = gimp_item_get_image (GIMP_ITEM (channel));
gimp_item_offsets (GIMP_ITEM (channel), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (channel), &off_x, &off_y);
gimp_channel_select_channel (gimp_image_get_mask (image),
_("Channel to Selection"),
@ -501,7 +501,7 @@ HELP
gint off_x, off_y;
image = gimp_item_get_image (GIMP_ITEM (channel));
gimp_item_offsets (GIMP_ITEM (channel), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (channel), &off_x, &off_y);
gimp_channel_select_channel (gimp_image_get_mask (image),
_("Channel to Selection"),

8
tools/pdbgen/pdb/transform_tools.pdb
View File

@ -104,7 +104,7 @@ sub perspective {
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -168,7 +168,7 @@ sub rotate {
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -242,7 +242,7 @@ sub scale {
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;
@ -308,7 +308,7 @@ sub shear {
GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
x += off_x;
y += off_y;

2
tools/pdbgen/pdb/vectors.pdb
View File

@ -110,7 +110,7 @@ HELP
vectors = gimp_text_vectors_new (image,
gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)));
gimp_item_offsets (GIMP_ITEM (layer), &x, &y);
gimp_item_get_offset (GIMP_ITEM (layer), &x, &y);
gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
}
else