gimp r27529 - in trunk: . app/actions app/core app/display app/paint app/pdb app/text app/tools app/widgets tools/pdbgen/pdb
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27529 - in trunk: . app/actions app/core app/display app/paint app/pdb app/text app/tools app/widgets tools/pdbgen/pdb
- Date: Sun, 2 Nov 2008 23:03:29 +0000 (UTC)
Author: mitch
Date: Sun Nov 2 23:03:29 2008
New Revision: 27529
URL: http://svn.gnome.org/viewvc/gimp?rev=27529&view=rev
Log:
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.
Modified:
trunk/ChangeLog
trunk/app/actions/drawable-commands.c
trunk/app/actions/layers-commands.c
trunk/app/core/gimp-edit.c
trunk/app/core/gimpchannel-select.c
trunk/app/core/gimpchannel.c
trunk/app/core/gimpdrawable-blend.c
trunk/app/core/gimpdrawable-bucket-fill.c
trunk/app/core/gimpdrawable-combine.c
trunk/app/core/gimpdrawable-foreground-extract.c
trunk/app/core/gimpdrawable-histogram.c
trunk/app/core/gimpdrawable-stroke.c
trunk/app/core/gimpdrawable.c
trunk/app/core/gimpdrawablestack.c
trunk/app/core/gimpimage-arrange.c
trunk/app/core/gimpimage-convert.c
trunk/app/core/gimpimage-crop.c
trunk/app/core/gimpimage-merge.c
trunk/app/core/gimpimage-pick-color.c
trunk/app/core/gimpimage-resize.c
trunk/app/core/gimpimage-rotate.c
trunk/app/core/gimpimage.c
trunk/app/core/gimpitem.c
trunk/app/core/gimpitem.h
trunk/app/core/gimpitempropundo.c
trunk/app/core/gimplayer-floating-sel.c
trunk/app/core/gimplayer.c
trunk/app/core/gimppalette-import.c
trunk/app/core/gimpprojection-construct.c
trunk/app/core/gimpselection.c
trunk/app/display/gimpdisplayshell-dnd.c
trunk/app/display/gimpdisplayshell-preview.c
trunk/app/display/gimpdisplayshell-transform.c
trunk/app/display/gimpdisplayshell.c
trunk/app/paint/gimppaintcore-stroke.c
trunk/app/paint/gimppaintcore.c
trunk/app/paint/gimpsourcecore.c
trunk/app/pdb/drawable-cmds.c
trunk/app/pdb/drawable-transform-cmds.c
trunk/app/pdb/selection-cmds.c
trunk/app/pdb/transform-tools-cmds.c
trunk/app/pdb/vectors-cmds.c
trunk/app/text/gimptextlayer-xcf.c
trunk/app/tools/gimpaligntool.c
trunk/app/tools/gimpblendtool.c
trunk/app/tools/gimpbucketfilltool.c
trunk/app/tools/gimpbycolorselecttool.c
trunk/app/tools/gimpcolortool.c
trunk/app/tools/gimpeditselectiontool.c
trunk/app/tools/gimpfuzzyselecttool.c
trunk/app/tools/gimpimagemaptool.c
trunk/app/tools/gimppainttool.c
trunk/app/tools/gimpperspectiveclonetool.c
trunk/app/tools/gimprectangletool.c
trunk/app/tools/gimpregionselecttool.c
trunk/app/tools/gimpsourcetool.c
trunk/app/tools/gimptexttool.c
trunk/app/tools/gimptransformtool.c
trunk/app/widgets/gimptoolbox-dnd.c
trunk/tools/pdbgen/pdb/drawable.pdb
trunk/tools/pdbgen/pdb/drawable_transform.pdb
trunk/tools/pdbgen/pdb/selection.pdb
trunk/tools/pdbgen/pdb/transform_tools.pdb
trunk/tools/pdbgen/pdb/vectors.pdb
Modified: trunk/app/actions/drawable-commands.c
==============================================================================
--- trunk/app/actions/drawable-commands.c (original)
+++ trunk/app/actions/drawable-commands.c Sun Nov 2 23:03:29 2008
@@ -210,7 +210,7 @@
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 @@
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);
Modified: trunk/app/actions/layers-commands.c
==============================================================================
--- trunk/app/actions/layers-commands.c (original)
+++ trunk/app/actions/layers-commands.c Sun Nov 2 23:03:29 2008
@@ -300,7 +300,7 @@
{
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 @@
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 @@
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 @@
{
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"),
Modified: trunk/app/core/gimp-edit.c
==============================================================================
--- trunk/app/core/gimp-edit.c (original)
+++ trunk/app/core/gimp-edit.c Sun Nov 2 23:03:29 2008
@@ -203,7 +203,7 @@
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 &&
Modified: trunk/app/core/gimpchannel-select.c
==============================================================================
--- trunk/app/core/gimpchannel-select.c (original)
+++ trunk/app/core/gimpchannel-select.c Sun Nov 2 23:03:29 2008
@@ -429,7 +429,7 @@
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 @@
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 @@
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,
Modified: trunk/app/core/gimpchannel.c
==============================================================================
--- trunk/app/core/gimpchannel.c (original)
+++ trunk/app/core/gimpchannel.c Sun Nov 2 23:03:29 2008
@@ -721,7 +721,7 @@
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)
{
Modified: trunk/app/core/gimpdrawable-blend.c
==============================================================================
--- trunk/app/core/gimpdrawable-blend.c (original)
+++ trunk/app/core/gimpdrawable-blend.c Sun Nov 2 23:03:29 2008
@@ -592,7 +592,7 @@
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);
Modified: trunk/app/core/gimpdrawable-bucket-fill.c
==============================================================================
--- trunk/app/core/gimpdrawable-bucket-fill.c (original)
+++ trunk/app/core/gimpdrawable-bucket-fill.c Sun Nov 2 23:03:29 2008
@@ -200,7 +200,7 @@
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 @@
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)));
Modified: trunk/app/core/gimpdrawable-combine.c
==============================================================================
--- trunk/app/core/gimpdrawable-combine.c (original)
+++ trunk/app/core/gimpdrawable-combine.c Sun Nov 2 23:03:29 2008
@@ -79,7 +79,7 @@
}
/* 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 @@
}
/* 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));
Modified: trunk/app/core/gimpdrawable-foreground-extract.c
==============================================================================
--- trunk/app/core/gimpdrawable-foreground-extract.c (original)
+++ trunk/app/core/gimpdrawable-foreground-extract.c Sun Nov 2 23:03:29 2008
@@ -94,7 +94,7 @@
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)),
Modified: trunk/app/core/gimpdrawable-histogram.c
==============================================================================
--- trunk/app/core/gimpdrawable-histogram.c (original)
+++ trunk/app/core/gimpdrawable-histogram.c Sun Nov 2 23:03:29 2008
@@ -62,7 +62,7 @@
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);
Modified: trunk/app/core/gimpdrawable-stroke.c
==============================================================================
--- trunk/app/core/gimpdrawable-stroke.c (original)
+++ trunk/app/core/gimpdrawable-stroke.c Sun Nov 2 23:03:29 2008
@@ -379,7 +379,7 @@
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,
Modified: trunk/app/core/gimpdrawable.c
==============================================================================
--- trunk/app/core/gimpdrawable.c (original)
+++ trunk/app/core/gimpdrawable.c Sun Nov 2 23:03:29 2008
@@ -555,7 +555,7 @@
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 @@
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 @@
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 @@
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 @@
{
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 @@
{
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,
Modified: trunk/app/core/gimpdrawablestack.c
==============================================================================
--- trunk/app/core/gimpdrawablestack.c (original)
+++ trunk/app/core/gimpdrawablestack.c Sun Nov 2 23:03:29 2008
@@ -396,7 +396,7 @@
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 @@
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,
Modified: trunk/app/core/gimpimage-arrange.c
==============================================================================
--- trunk/app/core/gimpimage-arrange.c (original)
+++ trunk/app/core/gimpimage-arrange.c Sun Nov 2 23:03:29 2008
@@ -259,7 +259,7 @@
/* 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 @@
}
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);
}
Modified: trunk/app/core/gimpimage-convert.c
==============================================================================
--- trunk/app/core/gimpimage-convert.c (original)
+++ trunk/app/core/gimpimage-convert.c Sun Nov 2 23:03:29 2008
@@ -1173,7 +1173,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
Modified: trunk/app/core/gimpimage-crop.c
==============================================================================
--- trunk/app/core/gimpimage-crop.c (original)
+++ trunk/app/core/gimpimage-crop.c Sun Nov 2 23:03:29 2008
@@ -110,7 +110,7 @@
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 @@
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));
Modified: trunk/app/core/gimpimage-merge.c
==============================================================================
--- trunk/app/core/gimpimage-merge.c (original)
+++ trunk/app/core/gimpimage-merge.c Sun Nov 2 23:03:29 2008
@@ -344,7 +344,7 @@
{
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 @@
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);
Modified: trunk/app/core/gimpimage-pick-color.c
==============================================================================
--- trunk/app/core/gimpimage-pick-color.c (original)
+++ trunk/app/core/gimpimage-pick-color.c Sun Nov 2 23:03:29 2008
@@ -65,7 +65,7 @@
{
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;
Modified: trunk/app/core/gimpimage-resize.c
==============================================================================
--- trunk/app/core/gimpimage-resize.c (original)
+++ trunk/app/core/gimpimage-resize.c Sun Nov 2 23:03:29 2008
@@ -154,7 +154,7 @@
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);
Modified: trunk/app/core/gimpimage-rotate.c
==============================================================================
--- trunk/app/core/gimpimage-rotate.c (original)
+++ trunk/app/core/gimpimage-rotate.c Sun Nov 2 23:03:29 2008
@@ -175,7 +175,7 @@
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 @@
return;
}
- gimp_item_offsets (item, &off_x, &off_y);
+ gimp_item_get_offset (item, &off_x, &off_y);
x -= off_x;
y -= off_y;
Modified: trunk/app/core/gimpimage.c
==============================================================================
--- trunk/app/core/gimpimage.c (original)
+++ trunk/app/core/gimpimage.c Sun Nov 2 23:03:29 2008
@@ -3065,7 +3065,7 @@
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 @@
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 @@
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;
Modified: trunk/app/core/gimpitem.c
==============================================================================
--- trunk/app/core/gimpitem.c (original)
+++ trunk/app/core/gimpitem.c Sun Nov 2 23:03:29 2008
@@ -693,7 +693,7 @@
}
/**
- * 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 @@
* 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 @@
}
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));
Modified: trunk/app/core/gimpitem.h
==============================================================================
--- trunk/app/core/gimpitem.h (original)
+++ trunk/app/core/gimpitem.h Sun Nov 2 23:03:29 2008
@@ -159,10 +159,11 @@
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);
Modified: trunk/app/core/gimpitempropundo.c
==============================================================================
--- trunk/app/core/gimpitempropundo.c (original)
+++ trunk/app/core/gimpitempropundo.c Sun Nov 2 23:03:29 2008
@@ -115,9 +115,9 @@
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 @@
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,
Modified: trunk/app/core/gimplayer-floating-sel.c
==============================================================================
--- trunk/app/core/gimplayer-floating-sel.c (original)
+++ trunk/app/core/gimplayer-floating-sel.c Sun Nov 2 23:03:29 2008
@@ -278,7 +278,7 @@
* 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 @@
*/
/* 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 @@
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 @@
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);
Modified: trunk/app/core/gimplayer.c
==============================================================================
--- trunk/app/core/gimplayer.c (original)
+++ trunk/app/core/gimplayer.c Sun Nov 2 23:03:29 2008
@@ -1825,7 +1825,7 @@
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),
Modified: trunk/app/core/gimppalette-import.c
==============================================================================
--- trunk/app/core/gimppalette-import.c (original)
+++ trunk/app/core/gimppalette-import.c Sun Nov 2 23:03:29 2008
@@ -473,7 +473,7 @@
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)),
Modified: trunk/app/core/gimpprojection-construct.c
==============================================================================
--- trunk/app/core/gimpprojection-construct.c (original)
+++ trunk/app/core/gimpprojection-construct.c Sun Nov 2 23:03:29 2008
@@ -117,7 +117,7 @@
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 @@
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 @@
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)) &&
Modified: trunk/app/core/gimpselection.c
==============================================================================
--- trunk/app/core/gimpselection.c (original)
+++ trunk/app/core/gimpselection.c Sun Nov 2 23:03:29 2008
@@ -376,7 +376,7 @@
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_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
Modified: trunk/app/display/gimpdisplayshell-dnd.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-dnd.c (original)
+++ trunk/app/display/gimpdisplayshell-dnd.c Sun Nov 2 23:03:29 2008
@@ -171,7 +171,7 @@
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;
Modified: trunk/app/display/gimpdisplayshell-preview.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-preview.c (original)
+++ trunk/app/display/gimpdisplayshell-preview.c Sun Nov 2 23:03:29 2008
@@ -207,7 +207,7 @@
{
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);
}
Modified: trunk/app/display/gimpdisplayshell-transform.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-transform.c (original)
+++ trunk/app/display/gimpdisplayshell-transform.c Sun Nov 2 23:03:29 2008
@@ -128,7 +128,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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++)
Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c (original)
+++ trunk/app/display/gimpdisplayshell.c Sun Nov 2 23:03:29 2008
@@ -1631,7 +1631,7 @@
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))
Modified: trunk/app/paint/gimppaintcore-stroke.c
==============================================================================
--- trunk/app/paint/gimppaintcore-stroke.c (original)
+++ trunk/app/paint/gimppaintcore-stroke.c Sun Nov 2 23:03:29 2008
@@ -128,7 +128,7 @@
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 @@
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;
Modified: trunk/app/paint/gimppaintcore.c
==============================================================================
--- trunk/app/paint/gimppaintcore.c (original)
+++ trunk/app/paint/gimppaintcore.c Sun Nov 2 23:03:29 2008
@@ -805,7 +805,7 @@
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),
Modified: trunk/app/paint/gimpsourcecore.c
==============================================================================
--- trunk/app/paint/gimpsourcecore.c (original)
+++ trunk/app/paint/gimpsourcecore.c Sun Nov 2 23:03:29 2008
@@ -370,7 +370,7 @@
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;
Modified: trunk/app/pdb/drawable-cmds.c
==============================================================================
--- trunk/app/pdb/drawable-cmds.c (original)
+++ trunk/app/pdb/drawable-cmds.c Sun Nov 2 23:03:29 2008
@@ -469,7 +469,7 @@
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,
Modified: trunk/app/pdb/drawable-transform-cmds.c
==============================================================================
--- trunk/app/pdb/drawable-transform-cmds.c (original)
+++ trunk/app/pdb/drawable-transform-cmds.c Sun Nov 2 23:03:29 2008
@@ -134,7 +134,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;
Modified: trunk/app/pdb/selection-cmds.c
==============================================================================
--- trunk/app/pdb/selection-cmds.c (original)
+++ trunk/app/pdb/selection-cmds.c Sun Nov 2 23:03:29 2008
@@ -448,7 +448,7 @@
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 @@
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"),
Modified: trunk/app/pdb/transform-tools-cmds.c
==============================================================================
--- trunk/app/pdb/transform-tools-cmds.c (original)
+++ trunk/app/pdb/transform-tools-cmds.c Sun Nov 2 23:03:29 2008
@@ -127,7 +127,7 @@
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 @@
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 @@
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 @@
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;
Modified: trunk/app/pdb/vectors-cmds.c
==============================================================================
--- trunk/app/pdb/vectors-cmds.c (original)
+++ trunk/app/pdb/vectors-cmds.c Sun Nov 2 23:03:29 2008
@@ -128,7 +128,7 @@
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
Modified: trunk/app/text/gimptextlayer-xcf.c
==============================================================================
--- trunk/app/text/gimptextlayer-xcf.c (original)
+++ trunk/app/text/gimptextlayer-xcf.c Sun Nov 2 23:03:29 2008
@@ -205,7 +205,7 @@
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);
Modified: trunk/app/tools/gimpaligntool.c
==============================================================================
--- trunk/app/tools/gimpaligntool.c (original)
+++ trunk/app/tools/gimpaligntool.c Sun Nov 2 23:03:29 2008
@@ -409,7 +409,7 @@
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 @@
}
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 @@
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));
Modified: trunk/app/tools/gimpblendtool.c
==============================================================================
--- trunk/app/tools/gimpblendtool.c (original)
+++ trunk/app/tools/gimpblendtool.c Sun Nov 2 23:03:29 2008
@@ -223,7 +223,7 @@
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,
Modified: trunk/app/tools/gimpbucketfilltool.c
==============================================================================
--- trunk/app/tools/gimpbucketfilltool.c (original)
+++ trunk/app/tools/gimpbucketfilltool.c Sun Nov 2 23:03:29 2008
@@ -139,7 +139,7 @@
{
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;
Modified: trunk/app/tools/gimpbycolorselecttool.c
==============================================================================
--- trunk/app/tools/gimpbycolorselecttool.c (original)
+++ trunk/app/tools/gimpbycolorselecttool.c Sun Nov 2 23:03:29 2008
@@ -113,7 +113,7 @@
{
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;
Modified: trunk/app/tools/gimpcolortool.c
==============================================================================
--- trunk/app/tools/gimpcolortool.c (original)
+++ trunk/app/tools/gimpcolortool.c Sun Nov 2 23:03:29 2008
@@ -267,7 +267,7 @@
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_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;
Modified: trunk/app/tools/gimpeditselectiontool.c
==============================================================================
--- trunk/app/tools/gimpeditselectiontool.c (original)
+++ trunk/app/tools/gimpeditselectiontool.c Sun Nov 2 23:03:29 2008
@@ -254,7 +254,7 @@
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 @@
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 @@
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 @@
}
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 @@
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 @@
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);
Modified: trunk/app/tools/gimpfuzzyselecttool.c
==============================================================================
--- trunk/app/tools/gimpfuzzyselecttool.c (original)
+++ trunk/app/tools/gimpfuzzyselecttool.c Sun Nov 2 23:03:29 2008
@@ -110,7 +110,7 @@
{
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;
Modified: trunk/app/tools/gimpimagemaptool.c
==============================================================================
--- trunk/app/tools/gimpimagemaptool.c (original)
+++ trunk/app/tools/gimpimagemaptool.c Sun Nov 2 23:03:29 2008
@@ -415,7 +415,7 @@
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_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,
Modified: trunk/app/tools/gimppainttool.c
==============================================================================
--- trunk/app/tools/gimppainttool.c (original)
+++ trunk/app/tools/gimppainttool.c Sun Nov 2 23:03:29 2008
@@ -302,7 +302,7 @@
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 @@
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 @@
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;
Modified: trunk/app/tools/gimpperspectiveclonetool.c
==============================================================================
--- trunk/app/tools/gimpperspectiveclonetool.c (original)
+++ trunk/app/tools/gimpperspectiveclonetool.c Sun Nov 2 23:03:29 2008
@@ -788,8 +788,8 @@
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;
Modified: trunk/app/tools/gimprectangletool.c
==============================================================================
--- trunk/app/tools/gimprectangletool.c (original)
+++ trunk/app/tools/gimprectangletool.c Sun Nov 2 23:03:29 2008
@@ -724,7 +724,7 @@
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 @@
{
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);
}
Modified: trunk/app/tools/gimpregionselecttool.c
==============================================================================
--- trunk/app/tools/gimpregionselecttool.c (original)
+++ trunk/app/tools/gimpregionselecttool.c Sun Nov 2 23:03:29 2008
@@ -220,7 +220,7 @@
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),
Modified: trunk/app/tools/gimpsourcetool.c
==============================================================================
--- trunk/app/tools/gimpsourcetool.c (original)
+++ trunk/app/tools/gimpsourcetool.c Sun Nov 2 23:03:29 2008
@@ -375,7 +375,7 @@
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),
Modified: trunk/app/tools/gimptexttool.c
==============================================================================
--- trunk/app/tools/gimptexttool.c (original)
+++ trunk/app/tools/gimptexttool.c Sun Nov 2 23:03:29 2008
@@ -2396,7 +2396,7 @@
{
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);
}
Modified: trunk/app/tools/gimptransformtool.c
==============================================================================
--- trunk/app/tools/gimptransformtool.c (original)
+++ trunk/app/tools/gimptransformtool.c Sun Nov 2 23:03:29 2008
@@ -1500,7 +1500,7 @@
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,
Modified: trunk/app/widgets/gimptoolbox-dnd.c
==============================================================================
--- trunk/app/widgets/gimptoolbox-dnd.c (original)
+++ trunk/app/widgets/gimptoolbox-dnd.c Sun Nov 2 23:03:29 2008
@@ -219,7 +219,7 @@
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);
Modified: trunk/tools/pdbgen/pdb/drawable.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/drawable.pdb (original)
+++ trunk/tools/pdbgen/pdb/drawable.pdb Sun Nov 2 23:03:29 2008
@@ -596,7 +596,7 @@
%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
);
Modified: trunk/tools/pdbgen/pdb/drawable_transform.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/drawable_transform.pdb (original)
+++ trunk/tools/pdbgen/pdb/drawable_transform.pdb Sun Nov 2 23:03:29 2008
@@ -44,7 +44,7 @@
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 @@
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;
Modified: trunk/tools/pdbgen/pdb/selection.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/selection.pdb (original)
+++ trunk/tools/pdbgen/pdb/selection.pdb Sun Nov 2 23:03:29 2008
@@ -465,7 +465,7 @@
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 @@
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"),
Modified: trunk/tools/pdbgen/pdb/transform_tools.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/transform_tools.pdb (original)
+++ trunk/tools/pdbgen/pdb/transform_tools.pdb Sun Nov 2 23:03:29 2008
@@ -104,7 +104,7 @@
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 @@
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 @@
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 @@
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;
Modified: trunk/tools/pdbgen/pdb/vectors.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/vectors.pdb (original)
+++ trunk/tools/pdbgen/pdb/vectors.pdb Sun Nov 2 23:03:29 2008
@@ -110,7 +110,7 @@
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
