gimp r27531 - in trunk: . app/actions app/core app/dialogs app/display app/paint app/pdb app/text app/tools app/vectors app/widgets app/xcf tools/pdbgen/pdb
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27531 - in trunk: . app/actions app/core app/dialogs app/display app/paint app/pdb app/text app/tools app/vectors app/widgets app/xcf tools/pdbgen/pdb
- Date: Mon, 3 Nov 2008 00:09:01 +0000 (UTC)
Author: mitch
Date: Mon Nov 3 00:09:01 2008
New Revision: 27531
URL: http://svn.gnome.org/viewvc/gimp?rev=27531&view=rev
Log:
2008-11-03 Michael Natterer <mitch gimp org>
* app/core/gimpitem.[ch]: renamed
gimp_item_width() to gimp_item_get_width() and
gimp_item_height() to gimp_item_get_height().
* app/actions/channels-commands.c
* app/actions/drawable-commands.c
* app/actions/layers-commands.c
* app/core/<many>.c
* app/dialogs/offset-dialog.c
* app/dialogs/resize-dialog.c
* app/dialogs/scale-dialog.c
* app/display/gimpdisplayshell-dnd.c
* app/display/gimpdisplayshell.c
* app/paint/gimpbrushcore.c
* app/paint/gimpdodgeburn.c
* app/paint/gimpink.c
* app/paint/gimppaintcore.c
* app/paint/gimpsmudge.c
* app/text/gimptextlayer-xcf.c
* app/text/gimptextlayer.c
* app/tools/gimpaligntool.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpforegroundselecttool.c
* app/tools/gimpimagemaptool.c
* app/tools/gimprectangletool.c
* app/tools/gimpregionselecttool.c
* app/tools/gimptexttool.c
* app/vectors/gimpvectors.c
* app/vectors/gimpvectorsmodundo.c
* app/widgets/gimptoolbox-dnd.c
* app/widgets/gimpviewrendererdrawable.c
* app/widgets/gimpviewrenderervectors.c
* app/xcf/xcf-load.c
* app/xcf/xcf-save.c
* tools/pdbgen/pdb/drawable.pdb: changed accordingly.
* app/pdb/drawable-cmds.c: regenerated.
Modified:
trunk/ChangeLog
trunk/app/actions/channels-commands.c
trunk/app/actions/drawable-commands.c
trunk/app/actions/layers-commands.c
trunk/app/core/gimp-edit.c
trunk/app/core/gimpchannel-combine.c
trunk/app/core/gimpchannel-select.c
trunk/app/core/gimpchannel.c
trunk/app/core/gimpdrawable-bucket-fill.c
trunk/app/core/gimpdrawable-combine.c
trunk/app/core/gimpdrawable-convert.c
trunk/app/core/gimpdrawable-foreground-extract.c
trunk/app/core/gimpdrawable-offset.c
trunk/app/core/gimpdrawable-preview.c
trunk/app/core/gimpdrawable-shadow.c
trunk/app/core/gimpdrawable-stroke.c
trunk/app/core/gimpdrawable.c
trunk/app/core/gimpdrawablestack.c
trunk/app/core/gimpfloatingselundo.c
trunk/app/core/gimpimage-arrange.c
trunk/app/core/gimpimage-contiguous-region.c
trunk/app/core/gimpimage-convert.c
trunk/app/core/gimpimage-crop.c
trunk/app/core/gimpimage-merge.c
trunk/app/core/gimpimage-resize.c
trunk/app/core/gimpimage-rotate.c
trunk/app/core/gimpimage-scale.c
trunk/app/core/gimpimage-undo-push.c
trunk/app/core/gimpimage.c
trunk/app/core/gimpimagemap.c
trunk/app/core/gimpitem-preview.c
trunk/app/core/gimpitem.c
trunk/app/core/gimpitem.h
trunk/app/core/gimplayer-floating-sel.c
trunk/app/core/gimplayer.c
trunk/app/core/gimplayermask.c
trunk/app/core/gimpmaskundo.c
trunk/app/core/gimppalette-import.c
trunk/app/core/gimpprojection-construct.c
trunk/app/core/gimpselection.c
trunk/app/dialogs/offset-dialog.c
trunk/app/dialogs/resize-dialog.c
trunk/app/dialogs/scale-dialog.c
trunk/app/display/gimpdisplayshell-dnd.c
trunk/app/display/gimpdisplayshell.c
trunk/app/paint/gimpbrushcore.c
trunk/app/paint/gimpdodgeburn.c
trunk/app/paint/gimpink.c
trunk/app/paint/gimppaintcore.c
trunk/app/paint/gimpsmudge.c
trunk/app/pdb/drawable-cmds.c
trunk/app/text/gimptextlayer-xcf.c
trunk/app/text/gimptextlayer.c
trunk/app/tools/gimpaligntool.c
trunk/app/tools/gimpeditselectiontool.c
trunk/app/tools/gimpforegroundselecttool.c
trunk/app/tools/gimpimagemaptool.c
trunk/app/tools/gimprectangletool.c
trunk/app/tools/gimpregionselecttool.c
trunk/app/tools/gimptexttool.c
trunk/app/vectors/gimpvectors.c
trunk/app/vectors/gimpvectorsmodundo.c
trunk/app/widgets/gimptoolbox-dnd.c
trunk/app/widgets/gimpviewrendererdrawable.c
trunk/app/widgets/gimpviewrenderervectors.c
trunk/app/xcf/xcf-load.c
trunk/app/xcf/xcf-save.c
trunk/tools/pdbgen/pdb/drawable.pdb
Modified: trunk/app/actions/channels-commands.c
==============================================================================
--- trunk/app/actions/channels-commands.c (original)
+++ trunk/app/actions/channels-commands.c Mon Nov 3 00:09:01 2008
@@ -145,8 +145,8 @@
{
GimpChannel *template = GIMP_CHANNEL (GIMP_ACTION (action)->viewable);
- width = gimp_item_width (GIMP_ITEM (template));
- height = gimp_item_height (GIMP_ITEM (template));
+ width = gimp_item_get_width (GIMP_ITEM (template));
+ height = gimp_item_get_height (GIMP_ITEM (template));
color = template->color;
}
else
Modified: trunk/app/actions/drawable-commands.c
==============================================================================
--- trunk/app/actions/drawable-commands.c (original)
+++ trunk/app/actions/drawable-commands.c Mon Nov 3 00:09:01 2008
@@ -215,11 +215,11 @@
switch ((GimpOrientationType) value)
{
case GIMP_ORIENTATION_HORIZONTAL:
- axis = ((gdouble) off_x + (gdouble) gimp_item_width (item) / 2.0);
+ axis = ((gdouble) off_x + (gdouble) gimp_item_get_width (item) / 2.0);
break;
case GIMP_ORIENTATION_VERTICAL:
- axis = ((gdouble) off_y + (gdouble) gimp_item_height (item) / 2.0);
+ axis = ((gdouble) off_y + (gdouble) gimp_item_get_height (item) / 2.0);
break;
default:
@@ -262,8 +262,8 @@
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);
+ center_x = ((gdouble) off_x + (gdouble) gimp_item_get_width (item) / 2.0);
+ center_y = ((gdouble) off_y + (gdouble) gimp_item_get_height (item) / 2.0);
if (gimp_item_get_linked (item))
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
Modified: trunk/app/actions/layers-commands.c
==============================================================================
--- trunk/app/actions/layers-commands.c (original)
+++ trunk/app/actions/layers-commands.c Mon Nov 3 00:09:01 2008
@@ -301,8 +301,8 @@
GimpLayer *template = GIMP_LAYER (GIMP_ACTION (action)->viewable);
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));
+ width = gimp_item_get_width (GIMP_ITEM (template));
+ height = gimp_item_get_height (GIMP_ITEM (template));
opacity = gimp_layer_get_opacity (template);
mode = gimp_layer_get_mode (template);
}
@@ -542,7 +542,7 @@
new_vectors = gimp_text_vectors_new (image, GIMP_TEXT_LAYER (layer)->text);
gimp_vectors_warp_vectors (vectors, new_vectors,
- 0.5 * gimp_item_height (GIMP_ITEM (layer)));
+ 0.5 * gimp_item_get_height (GIMP_ITEM (layer)));
gimp_item_set_visible (GIMP_ITEM (new_vectors), TRUE, FALSE);
@@ -1085,8 +1085,8 @@
gtk_widget_destroy (dialog);
- if (width == gimp_item_width (item) &&
- height == gimp_item_height (item))
+ if (width == gimp_item_get_width (item) &&
+ height == gimp_item_get_height (item))
return;
if (display)
@@ -1141,8 +1141,8 @@
gtk_widget_destroy (dialog);
- if (width == gimp_item_width (item) &&
- height == gimp_item_height (item))
+ if (width == gimp_item_get_width (item) &&
+ height == gimp_item_get_height (item))
return;
gimp_item_resize (item, context,
Modified: trunk/app/core/gimp-edit.c
==============================================================================
--- trunk/app/core/gimp-edit.c (original)
+++ trunk/app/core/gimp-edit.c Mon Nov 3 00:09:01 2008
@@ -240,8 +240,8 @@
center_y = gimp_image_get_height (image) / 2;
}
- width = gimp_item_width (GIMP_ITEM (layer));
- height = gimp_item_height (GIMP_ITEM (layer));
+ width = gimp_item_get_width (GIMP_ITEM (layer));
+ height = gimp_item_get_height (GIMP_ITEM (layer));
offset_x = center_x - width / 2;
offset_y = center_y - height / 2;
Modified: trunk/app/core/gimpchannel-combine.c
==============================================================================
--- trunk/app/core/gimpchannel-combine.c (original)
+++ trunk/app/core/gimpchannel-combine.c Mon Nov 3 00:09:01 2008
@@ -51,13 +51,13 @@
/* check horizontal extents... */
x2 = x + width;
- x2 = CLAMP (x2, 0, gimp_item_width (GIMP_ITEM (mask)));
- x = CLAMP (x, 0, gimp_item_width (GIMP_ITEM (mask)));
+ x2 = CLAMP (x2, 0, gimp_item_get_width (GIMP_ITEM (mask)));
+ x = CLAMP (x, 0, gimp_item_get_width (GIMP_ITEM (mask)));
width = x2 - x;
if (!width)
return;
- if (y < 0 || y >= gimp_item_height (GIMP_ITEM (mask)))
+ if (y < 0 || y >= gimp_item_get_height (GIMP_ITEM (mask)))
return;
pixel_region_init (&maskPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
@@ -96,14 +96,14 @@
/* check horizontal extents... */
x2 = x + width;
- x2 = CLAMP (x2, 0, gimp_item_width (GIMP_ITEM (mask)));
- x = CLAMP (x, 0, gimp_item_width (GIMP_ITEM (mask)));
+ x2 = CLAMP (x2, 0, gimp_item_get_width (GIMP_ITEM (mask)));
+ x = CLAMP (x, 0, gimp_item_get_width (GIMP_ITEM (mask)));
width = x2 - x;
if (! width)
return;
- if (y < 0 || y > gimp_item_height (GIMP_ITEM (mask)))
+ if (y < 0 || y > gimp_item_get_height (GIMP_ITEM (mask)))
return;
pixel_region_init (&maskPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
@@ -140,8 +140,8 @@
if (! gimp_rectangle_intersect (x, y, w, h,
0, 0,
- gimp_item_width (GIMP_ITEM (mask)),
- gimp_item_height (GIMP_ITEM (mask)),
+ gimp_item_get_width (GIMP_ITEM (mask)),
+ gimp_item_get_height (GIMP_ITEM (mask)),
&x, &y, &w, &h))
return;
@@ -178,10 +178,10 @@
else
mask->bounds_known = FALSE;
- mask->x1 = CLAMP (mask->x1, 0, gimp_item_width (GIMP_ITEM (mask)));
- mask->y1 = CLAMP (mask->y1, 0, gimp_item_height (GIMP_ITEM (mask)));
- mask->x2 = CLAMP (mask->x2, 0, gimp_item_width (GIMP_ITEM (mask)));
- mask->y2 = CLAMP (mask->y2, 0, gimp_item_height (GIMP_ITEM (mask)));
+ mask->x1 = CLAMP (mask->x1, 0, gimp_item_get_width (GIMP_ITEM (mask)));
+ mask->y1 = CLAMP (mask->y1, 0, gimp_item_get_height (GIMP_ITEM (mask)));
+ mask->x2 = CLAMP (mask->x2, 0, gimp_item_get_width (GIMP_ITEM (mask)));
+ mask->y2 = CLAMP (mask->y2, 0, gimp_item_get_height (GIMP_ITEM (mask)));
gimp_drawable_update (GIMP_DRAWABLE (mask), x, y, w, h);
}
@@ -286,8 +286,8 @@
if (! gimp_rectangle_intersect (x, y, w, h,
0, 0,
- gimp_item_width (GIMP_ITEM (mask)),
- gimp_item_height (GIMP_ITEM (mask)),
+ gimp_item_get_width (GIMP_ITEM (mask)),
+ gimp_item_get_height (GIMP_ITEM (mask)),
NULL, NULL, NULL, NULL))
{
return;
@@ -318,7 +318,7 @@
gdouble half_ellipse_width_at_y;
/* If this row is not part of the mask, continue with the next row */
- if (cur_y < 0 || cur_y >= gimp_item_height (GIMP_ITEM (mask)))
+ if (cur_y < 0 || cur_y >= gimp_item_get_height (GIMP_ITEM (mask)))
{
continue;
}
@@ -483,10 +483,10 @@
mask->bounds_known = FALSE;
}
- mask->x1 = CLAMP (mask->x1, 0, gimp_item_width (GIMP_ITEM (mask)));
- mask->y1 = CLAMP (mask->y1, 0, gimp_item_height (GIMP_ITEM (mask)));
- mask->x2 = CLAMP (mask->x2, 0, gimp_item_width (GIMP_ITEM (mask)));
- mask->y2 = CLAMP (mask->y2, 0, gimp_item_height (GIMP_ITEM (mask)));
+ mask->x1 = CLAMP (mask->x1, 0, gimp_item_get_width (GIMP_ITEM (mask)));
+ mask->y1 = CLAMP (mask->y1, 0, gimp_item_get_height (GIMP_ITEM (mask)));
+ mask->x2 = CLAMP (mask->x2, 0, gimp_item_get_width (GIMP_ITEM (mask)));
+ mask->y2 = CLAMP (mask->y2, 0, gimp_item_get_height (GIMP_ITEM (mask)));
gimp_drawable_update (GIMP_DRAWABLE (mask), x, y, w, h);
}
@@ -579,11 +579,11 @@
g_return_if_fail (GIMP_IS_CHANNEL (add_on));
if (! gimp_rectangle_intersect (off_x, off_y,
- gimp_item_width (GIMP_ITEM (add_on)),
- gimp_item_height (GIMP_ITEM (add_on)),
+ gimp_item_get_width (GIMP_ITEM (add_on)),
+ gimp_item_get_height (GIMP_ITEM (add_on)),
0, 0,
- gimp_item_width (GIMP_ITEM (mask)),
- gimp_item_height (GIMP_ITEM (mask)),
+ gimp_item_get_width (GIMP_ITEM (mask)),
+ gimp_item_get_height (GIMP_ITEM (mask)),
&x, &y, &w, &h))
return;
Modified: trunk/app/core/gimpchannel-select.c
==============================================================================
--- trunk/app/core/gimpchannel-select.c (original)
+++ trunk/app/core/gimpchannel-select.c Mon Nov 3 00:09:01 2008
@@ -72,8 +72,8 @@
GimpChannel *add_on;
add_on = gimp_channel_new_mask (gimp_item_get_image (item),
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
gimp_channel_combine_rect (add_on, GIMP_CHANNEL_OP_ADD, x, y, w, h);
if (feather)
@@ -123,8 +123,8 @@
GimpChannel *add_on;
add_on = gimp_channel_new_mask (gimp_item_get_image (item),
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
gimp_channel_combine_ellipse (add_on, GIMP_CHANNEL_OP_ADD,
x, y, w, h, antialias);
@@ -177,8 +177,8 @@
GimpChannel *add_on;
add_on = gimp_channel_new_mask (gimp_item_get_image (item),
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
gimp_channel_combine_ellipse_rect (add_on, GIMP_CHANNEL_OP_ADD,
x, y, w, h,
corner_radius_x, corner_radius_y,
@@ -234,8 +234,8 @@
item = GIMP_ITEM (channel);
add_on = gimp_channel_new_mask (gimp_item_get_image (item),
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
gimp_scan_convert_render (scan_convert,
gimp_drawable_get_tiles (GIMP_DRAWABLE (add_on)),
offset_x, offset_y, antialias);
@@ -374,8 +374,8 @@
GimpChannel *add_on2;
add_on2 = gimp_channel_new_mask (gimp_item_get_image (item),
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
gimp_channel_combine_mask (add_on2, add_on, GIMP_CHANNEL_OP_ADD,
offset_x, offset_y);
@@ -424,8 +424,8 @@
* so simply select the whole layer's extents. --mitch
*/
add_on = gimp_channel_new_mask (gimp_item_get_image (item),
- gimp_item_width (GIMP_ITEM (drawable)),
- gimp_item_height (GIMP_ITEM (drawable)));
+ gimp_item_get_width (GIMP_ITEM (drawable)),
+ gimp_item_get_height (GIMP_ITEM (drawable)));
gimp_channel_all (add_on, FALSE);
}
Modified: trunk/app/core/gimpchannel.c
==============================================================================
--- trunk/app/core/gimpchannel.c (original)
+++ trunk/app/core/gimpchannel.c Mon Nov 3 00:09:01 2008
@@ -431,8 +431,8 @@
if (gimp_drawable_has_alpha (drawable))
new_type = GIMP_IMAGE_TYPE_WITH_ALPHA (new_type);
- new_tiles = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ new_tiles = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
GIMP_IMAGE_TYPE_BYTES (new_type));
gimp_drawable_convert_grayscale (drawable, new_tiles, old_base_type);
@@ -451,19 +451,19 @@
PixelRegion destPR;
guchar bg[1] = { 0 };
- new_tiles = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ new_tiles = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
GIMP_IMAGE_TYPE_BYTES (GIMP_GRAY_IMAGE));
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
TRUE);
flatten_region (&srcPR, &destPR, bg);
@@ -483,8 +483,8 @@
item->offset_x = 0;
item->offset_y = 0;
- if (gimp_item_width (item) != width ||
- gimp_item_height (item) != height)
+ if (gimp_item_get_width (item) != width ||
+ gimp_item_get_height (item) != height)
{
gimp_item_resize (item, gimp_get_user_context (dest_image->gimp),
width, height, 0, 0);
@@ -516,10 +516,10 @@
else
gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (channel));
- x1 = CLAMP ((x1 + off_x), 0, gimp_item_width (GIMP_ITEM (channel)));
- y1 = CLAMP ((y1 + off_y), 0, gimp_item_height (GIMP_ITEM (channel)));
- x2 = CLAMP ((x2 + off_x), 0, gimp_item_width (GIMP_ITEM (channel)));
- y2 = CLAMP ((y2 + off_y), 0, gimp_item_height (GIMP_ITEM (channel)));
+ x1 = CLAMP ((x1 + off_x), 0, gimp_item_get_width (GIMP_ITEM (channel)));
+ y1 = CLAMP ((y1 + off_y), 0, gimp_item_get_height (GIMP_ITEM (channel)));
+ x2 = CLAMP ((x2 + off_x), 0, gimp_item_get_width (GIMP_ITEM (channel)));
+ y2 = CLAMP ((y2 + off_y), 0, gimp_item_get_height (GIMP_ITEM (channel)));
width = x2 - x1;
height = y2 - y1;
@@ -546,8 +546,8 @@
pixel_region_init (&srcPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)), TRUE);
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)), TRUE);
clear_region (&srcPR);
if (width != 0 && height != 0)
@@ -571,8 +571,8 @@
channel->empty = TRUE;
channel->x1 = 0;
channel->y1 = 0;
- channel->x2 = gimp_item_width (GIMP_ITEM (channel));
- channel->y2 = gimp_item_height (GIMP_ITEM (channel));
+ channel->x2 = gimp_item_get_width (GIMP_ITEM (channel));
+ channel->y2 = gimp_item_get_height (GIMP_ITEM (channel));
}
else
{
@@ -933,8 +933,8 @@
}
else
{
- if (x < 0 || x >= gimp_item_width (GIMP_ITEM (channel)) ||
- y < 0 || y >= gimp_item_height (GIMP_ITEM (channel)))
+ if (x < 0 || x >= gimp_item_get_width (GIMP_ITEM (channel)) ||
+ y < 0 || y >= gimp_item_get_height (GIMP_ITEM (channel)))
return 0;
}
@@ -987,8 +987,8 @@
pixel_region_init (&bPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)), FALSE);
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)), FALSE);
channel->segs_in = boundary_find (&bPR, BOUNDARY_WITHIN_BOUNDS,
x1, y1, x2, y2,
@@ -1047,16 +1047,16 @@
}
/* go through and calculate the bounds */
- tx1 = gimp_item_width (GIMP_ITEM (channel));
- ty1 = gimp_item_height (GIMP_ITEM (channel));
+ tx1 = gimp_item_get_width (GIMP_ITEM (channel));
+ ty1 = gimp_item_get_height (GIMP_ITEM (channel));
tx2 = 0;
ty2 = 0;
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)), FALSE);
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)), FALSE);
for (pr = pixel_regions_register (1, &maskPR);
pr != NULL;
@@ -1116,17 +1116,17 @@
}
}
- tx2 = CLAMP (tx2 + 1, 0, gimp_item_width (GIMP_ITEM (channel)));
- ty2 = CLAMP (ty2 + 1, 0, gimp_item_height (GIMP_ITEM (channel)));
+ tx2 = CLAMP (tx2 + 1, 0, gimp_item_get_width (GIMP_ITEM (channel)));
+ ty2 = CLAMP (ty2 + 1, 0, gimp_item_get_height (GIMP_ITEM (channel)));
- if (tx1 == gimp_item_width (GIMP_ITEM (channel)) &&
- ty1 == gimp_item_height (GIMP_ITEM (channel)))
+ if (tx1 == gimp_item_get_width (GIMP_ITEM (channel)) &&
+ ty1 == gimp_item_get_height (GIMP_ITEM (channel)))
{
channel->empty = TRUE;
channel->x1 = 0;
channel->y1 = 0;
- channel->x2 = gimp_item_width (GIMP_ITEM (channel));
- channel->y2 = gimp_item_height (GIMP_ITEM (channel));
+ channel->x2 = gimp_item_get_width (GIMP_ITEM (channel));
+ channel->y2 = gimp_item_get_height (GIMP_ITEM (channel));
}
else
{
@@ -1161,8 +1161,8 @@
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)), FALSE);
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)), FALSE);
for (pr = pixel_regions_register (1, &maskPR);
pr != NULL;
@@ -1195,8 +1195,8 @@
channel->boundary_known = TRUE;
channel->x1 = 0;
channel->y1 = 0;
- channel->x2 = gimp_item_width (GIMP_ITEM (channel));
- channel->y2 = gimp_item_height (GIMP_ITEM (channel));
+ channel->x2 = gimp_item_get_width (GIMP_ITEM (channel));
+ channel->y2 = gimp_item_get_height (GIMP_ITEM (channel));
return TRUE;
}
@@ -1218,16 +1218,16 @@
pixel_region_init (&srcPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)),
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)),
TRUE);
gaussian_blur_region (&srcPR, radius_x, radius_y);
channel->bounds_known = FALSE;
gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
static void
@@ -1246,8 +1246,8 @@
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)),
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)),
TRUE);
lut = threshold_lut_new (0.5, 1);
@@ -1258,8 +1258,8 @@
channel->bounds_known = FALSE;
gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
static void
@@ -1296,8 +1296,8 @@
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)), TRUE);
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)), TRUE);
clear_region (&maskPR);
}
@@ -1306,12 +1306,12 @@
channel->empty = TRUE;
channel->x1 = 0;
channel->y1 = 0;
- channel->x2 = gimp_item_width (GIMP_ITEM (channel));
- channel->y2 = gimp_item_height (GIMP_ITEM (channel));
+ channel->x2 = gimp_item_get_width (GIMP_ITEM (channel));
+ channel->y2 = gimp_item_get_height (GIMP_ITEM (channel));
gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
static void
@@ -1331,8 +1331,8 @@
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)), TRUE);
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)), TRUE);
color_region (&maskPR, &bg);
/* we know the bounds */
@@ -1340,12 +1340,12 @@
channel->empty = FALSE;
channel->x1 = 0;
channel->y1 = 0;
- channel->x2 = gimp_item_width (GIMP_ITEM (channel));
- channel->y2 = gimp_item_height (GIMP_ITEM (channel));
+ channel->x2 = gimp_item_get_width (GIMP_ITEM (channel));
+ channel->y2 = gimp_item_get_height (GIMP_ITEM (channel));
gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
static void
@@ -1370,8 +1370,8 @@
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)), TRUE);
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)), TRUE);
lut = invert_lut_new (1);
@@ -1384,8 +1384,8 @@
channel->bounds_known = FALSE;
gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
}
@@ -1414,8 +1414,8 @@
else
x1 -= radius_x;
- if (x2 + radius_x > gimp_item_width (GIMP_ITEM (channel)))
- x2 = gimp_item_width (GIMP_ITEM (channel));
+ if (x2 + radius_x > gimp_item_get_width (GIMP_ITEM (channel)))
+ x2 = gimp_item_get_width (GIMP_ITEM (channel));
else
x2 += radius_x;
@@ -1424,8 +1424,8 @@
else
y1 -= radius_y;
- if (y2 + radius_y > gimp_item_height (GIMP_ITEM (channel)))
- y2 = gimp_item_height (GIMP_ITEM (channel));
+ if (y2 + radius_y > gimp_item_get_height (GIMP_ITEM (channel)))
+ y2 = gimp_item_get_height (GIMP_ITEM (channel));
else
y2 += radius_y;
@@ -1444,8 +1444,8 @@
channel->bounds_known = FALSE;
gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
static void
@@ -1485,15 +1485,15 @@
else
y1 = 0;
- if (x2 + radius_x < gimp_item_width (GIMP_ITEM (channel)))
+ if (x2 + radius_x < gimp_item_get_width (GIMP_ITEM (channel)))
x2 = x2 + radius_x;
else
- x2 = gimp_item_width (GIMP_ITEM (channel));
+ x2 = gimp_item_get_width (GIMP_ITEM (channel));
- if (y2 + radius_y < gimp_item_height (GIMP_ITEM (channel)))
+ if (y2 + radius_y < gimp_item_get_height (GIMP_ITEM (channel)))
y2 = y2 + radius_y;
else
- y2 = gimp_item_height (GIMP_ITEM (channel));
+ y2 = gimp_item_get_height (GIMP_ITEM (channel));
if (push_undo)
gimp_channel_push_undo (channel,
@@ -1511,8 +1511,8 @@
channel->bounds_known = FALSE;
gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
static void
@@ -1547,9 +1547,9 @@
x1--;
if (y1 > 0)
y1--;
- if (x2 < gimp_item_width (GIMP_ITEM (channel)))
+ if (x2 < gimp_item_get_width (GIMP_ITEM (channel)))
x2++;
- if (y2 < gimp_item_height (GIMP_ITEM (channel)))
+ if (y2 < gimp_item_get_height (GIMP_ITEM (channel)))
y2++;
if (push_undo)
@@ -1567,8 +1567,8 @@
channel->bounds_known = FALSE;
gimp_drawable_update (GIMP_DRAWABLE (channel), 0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
static void
@@ -1628,8 +1628,8 @@
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
g_return_val_if_fail (gimp_drawable_has_alpha (drawable), NULL);
- width = gimp_item_width (GIMP_ITEM (drawable));
- height = gimp_item_height (GIMP_ITEM (drawable));
+ width = gimp_item_get_width (GIMP_ITEM (drawable));
+ height = gimp_item_get_height (GIMP_ITEM (drawable));
channel = gimp_channel_new (image, width, height, name, color);
@@ -1728,8 +1728,8 @@
gimp_drawable_update (GIMP_DRAWABLE (channel),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
g_signal_emit (channel, channel_signals[COLOR_CHANGED], 0);
}
@@ -1794,8 +1794,8 @@
gimp_drawable_update (GIMP_DRAWABLE (channel),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
g_signal_emit (channel, channel_signals[COLOR_CHANGED], 0);
}
@@ -1843,8 +1843,8 @@
gimp_drawable_update (GIMP_DRAWABLE (channel),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
}
Modified: trunk/app/core/gimpdrawable-bucket-fill.c
==============================================================================
--- trunk/app/core/gimpdrawable-bucket-fill.c (original)
+++ trunk/app/core/gimpdrawable-bucket-fill.c Mon Nov 3 00:09:01 2008
@@ -220,10 +220,10 @@
/* Limit the channel bounds to the drawable's extents */
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)));
- x2 = CLAMP (x2, off_x, (off_x + gimp_item_width (item)));
- y2 = CLAMP (y2, off_y, (off_y + gimp_item_height (item)));
+ x1 = CLAMP (x1, off_x, (off_x + gimp_item_get_width (item)));
+ y1 = CLAMP (y1, off_y, (off_y + gimp_item_get_height (item)));
+ x2 = CLAMP (x2, off_x, (off_x + gimp_item_get_width (item)));
+ y2 = CLAMP (y2, off_y, (off_y + gimp_item_get_height (item)));
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
Modified: trunk/app/core/gimpdrawable-combine.c
==============================================================================
--- trunk/app/core/gimpdrawable-combine.c (original)
+++ trunk/app/core/gimpdrawable-combine.c Mon Nov 3 00:09:01 2008
@@ -82,10 +82,10 @@
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));
- y1 = CLAMP (y, 0, gimp_item_height (item));
- x2 = CLAMP (x + src2PR->w, 0, gimp_item_width (item));
- y2 = CLAMP (y + src2PR->h, 0, gimp_item_height (item));
+ x1 = CLAMP (x, 0, gimp_item_get_width (item));
+ y1 = CLAMP (y, 0, gimp_item_get_height (item));
+ x2 = CLAMP (x + src2PR->w, 0, gimp_item_get_width (item));
+ y2 = CLAMP (y + src2PR->h, 0, gimp_item_get_height (item));
if (mask)
{
@@ -94,13 +94,13 @@
* into the mask coordinate system
*/
x1 = CLAMP (x1,
- - offset_x, gimp_item_width (GIMP_ITEM (mask)) - offset_x);
+ - offset_x, gimp_item_get_width (GIMP_ITEM (mask)) - offset_x);
y1 = CLAMP (y1,
- - offset_y, gimp_item_height (GIMP_ITEM (mask)) - offset_y);
+ - offset_y, gimp_item_get_height (GIMP_ITEM (mask)) - offset_y);
x2 = CLAMP (x2,
- - offset_x, gimp_item_width (GIMP_ITEM (mask)) - offset_x);
+ - offset_x, gimp_item_get_width (GIMP_ITEM (mask)) - offset_x);
y2 = CLAMP (y2,
- - offset_y, gimp_item_height (GIMP_ITEM (mask)) - offset_y);
+ - offset_y, gimp_item_get_height (GIMP_ITEM (mask)) - offset_y);
}
/* If the calling procedure specified an undo step... */
@@ -231,10 +231,10 @@
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));
- y1 = CLAMP (y, 0, gimp_item_height (item));
- x2 = CLAMP (x + src2PR->w, 0, gimp_item_width (item));
- y2 = CLAMP (y + src2PR->h, 0, gimp_item_height (item));
+ x1 = CLAMP (x, 0, gimp_item_get_width (item));
+ y1 = CLAMP (y, 0, gimp_item_get_height (item));
+ x2 = CLAMP (x + src2PR->w, 0, gimp_item_get_width (item));
+ y2 = CLAMP (y + src2PR->h, 0, gimp_item_get_height (item));
if (mask)
{
@@ -243,13 +243,13 @@
* into the mask coordinate system
*/
x1 = CLAMP (x1,
- - offset_x, gimp_item_width (GIMP_ITEM (mask)) - offset_x);
+ - offset_x, gimp_item_get_width (GIMP_ITEM (mask)) - offset_x);
y1 = CLAMP (y1,
- - offset_y, gimp_item_height (GIMP_ITEM (mask)) - offset_y);
+ - offset_y, gimp_item_get_height (GIMP_ITEM (mask)) - offset_y);
x2 = CLAMP (x2,
- - offset_x, gimp_item_width (GIMP_ITEM (mask)) - offset_x);
+ - offset_x, gimp_item_get_width (GIMP_ITEM (mask)) - offset_x);
y2 = CLAMP (y2,
- - offset_y, gimp_item_height (GIMP_ITEM (mask)) - offset_y);
+ - offset_y, gimp_item_get_height (GIMP_ITEM (mask)) - offset_y);
}
/* If the calling procedure specified an undo step... */
Modified: trunk/app/core/gimpdrawable-convert.c
==============================================================================
--- trunk/app/core/gimpdrawable-convert.c (original)
+++ trunk/app/core/gimpdrawable-convert.c Mon Nov 3 00:09:01 2008
@@ -57,13 +57,13 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (GIMP_ITEM (drawable)),
- gimp_item_height (GIMP_ITEM (drawable)),
+ gimp_item_get_width (GIMP_ITEM (drawable)),
+ gimp_item_get_height (GIMP_ITEM (drawable)),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (GIMP_ITEM (drawable)),
- gimp_item_height (GIMP_ITEM (drawable)),
+ gimp_item_get_width (GIMP_ITEM (drawable)),
+ gimp_item_get_height (GIMP_ITEM (drawable)),
TRUE);
@@ -161,13 +161,13 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (GIMP_ITEM (drawable)),
- gimp_item_height (GIMP_ITEM (drawable)),
+ gimp_item_get_width (GIMP_ITEM (drawable)),
+ gimp_item_get_height (GIMP_ITEM (drawable)),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (GIMP_ITEM (drawable)),
- gimp_item_height (GIMP_ITEM (drawable)),
+ gimp_item_get_width (GIMP_ITEM (drawable)),
+ gimp_item_get_height (GIMP_ITEM (drawable)),
TRUE);
switch (old_base_type)
Modified: trunk/app/core/gimpdrawable-foreground-extract.c
==============================================================================
--- trunk/app/core/gimpdrawable-foreground-extract.c (original)
+++ trunk/app/core/gimpdrawable-foreground-extract.c Mon Nov 3 00:09:01 2008
@@ -57,8 +57,8 @@
state =
gimp_drawable_foreground_extract_siox_init (drawable,
0, 0,
- gimp_item_width (GIMP_ITEM (mask)),
- gimp_item_height (GIMP_ITEM (mask)));
+ gimp_item_get_width (GIMP_ITEM (mask)),
+ gimp_item_get_height (GIMP_ITEM (mask)));
if (state)
{
@@ -97,8 +97,8 @@
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)),
- gimp_item_height (GIMP_ITEM (drawable)),
+ gimp_item_get_width (GIMP_ITEM (drawable)),
+ gimp_item_get_height (GIMP_ITEM (drawable)),
x, y, width, height,
&x, &y, &width, &height);
@@ -145,8 +145,8 @@
{
x1 = 0;
y1 = 0;
- x2 = gimp_item_width (GIMP_ITEM (mask));
- y2 = gimp_item_height (GIMP_ITEM (mask));
+ x2 = gimp_item_get_width (GIMP_ITEM (mask));
+ y2 = gimp_item_get_height (GIMP_ITEM (mask));
}
siox_foreground_extract (state, refinement,
Modified: trunk/app/core/gimpdrawable-offset.c
==============================================================================
--- trunk/app/core/gimpdrawable-offset.c (original)
+++ trunk/app/core/gimpdrawable-offset.c Mon Nov 3 00:09:01 2008
@@ -62,8 +62,8 @@
item = GIMP_ITEM (drawable);
- width = gimp_item_width (item);
- height = gimp_item_height (item);
+ width = gimp_item_get_width (item);
+ height = gimp_item_get_height (item);
if (wrap_around)
{
@@ -128,18 +128,18 @@
{
if (offset_x >= 0 && offset_y >= 0)
{
- src_x = gimp_item_width (item) - offset_x;
- src_y = gimp_item_height (item) - offset_y;
+ src_x = gimp_item_get_width (item) - offset_x;
+ src_y = gimp_item_get_height (item) - offset_y;
}
else if (offset_x >= 0 && offset_y < 0)
{
- src_x = gimp_item_width (item) - offset_x;
+ src_x = gimp_item_get_width (item) - offset_x;
src_y = 0;
}
else if (offset_x < 0 && offset_y >= 0)
{
src_x = 0;
- src_y = gimp_item_height (item) - offset_y;
+ src_y = gimp_item_get_height (item) - offset_y;
}
else if (offset_x < 0 && offset_y < 0)
{
@@ -147,13 +147,13 @@
src_y = 0;
}
- dest_x = (src_x + offset_x) % gimp_item_width (item);
+ dest_x = (src_x + offset_x) % gimp_item_get_width (item);
if (dest_x < 0)
- dest_x = gimp_item_width (item) + dest_x;
+ dest_x = gimp_item_get_width (item) + dest_x;
- dest_y = (src_y + offset_y) % gimp_item_height (item);
+ dest_y = (src_y + offset_y) % gimp_item_get_height (item);
if (dest_y < 0)
- dest_y = gimp_item_height (item) + dest_y;
+ dest_y = gimp_item_get_height (item) + dest_y;
/* intersecting region */
if (offset_x != 0 && offset_y != 0)
@@ -176,12 +176,12 @@
{
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
src_x, 0, ABS (offset_x),
- gimp_item_height (item) - ABS (offset_y),
+ gimp_item_get_height (item) - ABS (offset_y),
FALSE);
pixel_region_init (&destPR, new_tiles,
dest_x, dest_y + offset_y,
ABS (offset_x),
- gimp_item_height (item) - ABS (offset_y),
+ gimp_item_get_height (item) - ABS (offset_y),
TRUE);
}
else if (offset_y < 0)
@@ -189,12 +189,12 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
src_x, src_y - offset_y,
ABS (offset_x),
- gimp_item_height (item) - ABS (offset_y),
+ gimp_item_get_height (item) - ABS (offset_y),
FALSE);
pixel_region_init (&destPR, new_tiles,
dest_x, 0,
ABS (offset_x),
- gimp_item_height (item) - ABS (offset_y),
+ gimp_item_get_height (item) - ABS (offset_y),
TRUE);
}
@@ -208,20 +208,20 @@
{
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, src_y,
- gimp_item_width (item) - ABS (offset_x),
+ gimp_item_get_width (item) - ABS (offset_x),
ABS (offset_y), FALSE);
pixel_region_init (&destPR, new_tiles, dest_x + offset_x, dest_y,
- gimp_item_width (item) - ABS (offset_x),
+ gimp_item_get_width (item) - ABS (offset_x),
ABS (offset_y), TRUE);
}
else if (offset_x < 0)
{
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
src_x - offset_x, src_y,
- gimp_item_width (item) - ABS (offset_x),
+ gimp_item_get_width (item) - ABS (offset_x),
ABS (offset_y), FALSE);
pixel_region_init (&destPR, new_tiles, 0, dest_y,
- gimp_item_width (item) - ABS (offset_x),
+ gimp_item_get_width (item) - ABS (offset_x),
ABS (offset_y), TRUE);
}
@@ -251,17 +251,17 @@
else if (offset_x >= 0 && offset_y < 0)
{
dest_x = 0;
- dest_y = gimp_item_height (item) + offset_y;
+ dest_y = gimp_item_get_height (item) + offset_y;
}
else if (offset_x < 0 && offset_y >= 0)
{
- dest_x = gimp_item_width (item) + offset_x;
+ dest_x = gimp_item_get_width (item) + offset_x;
dest_y = 0;
}
else if (offset_x < 0 && offset_y < 0)
{
- dest_x = gimp_item_width (item) + offset_x;
- dest_y = gimp_item_height (item) + offset_y;
+ dest_x = gimp_item_get_width (item) + offset_x;
+ dest_y = gimp_item_get_height (item) + offset_y;
}
/* intersecting region */
@@ -279,13 +279,13 @@
pixel_region_init (&destPR, new_tiles,
dest_x, dest_y + offset_y,
ABS (offset_x),
- gimp_item_height (item) - ABS (offset_y),
+ gimp_item_get_height (item) - ABS (offset_y),
TRUE);
else if (offset_y < 0)
pixel_region_init (&destPR, new_tiles,
dest_x, 0,
ABS (offset_x),
- gimp_item_height (item) - ABS (offset_y),
+ gimp_item_get_height (item) - ABS (offset_y),
TRUE);
color_region (&destPR, fill);
@@ -298,13 +298,13 @@
pixel_region_init (&destPR, new_tiles,
dest_x + offset_x,
dest_y,
- gimp_item_width (item) - ABS (offset_x),
+ gimp_item_get_width (item) - ABS (offset_x),
ABS (offset_y),
TRUE);
else if (offset_x < 0)
pixel_region_init (&destPR, new_tiles,
0, dest_y,
- gimp_item_width (item) - ABS (offset_x),
+ gimp_item_get_width (item) - ABS (offset_x),
ABS (offset_y),
TRUE);
Modified: trunk/app/core/gimpdrawable-preview.c
==============================================================================
--- trunk/app/core/gimpdrawable-preview.c (original)
+++ trunk/app/core/gimpdrawable-preview.c Mon Nov 3 00:09:01 2008
@@ -144,8 +144,8 @@
item = GIMP_ITEM (drawable);
- g_return_val_if_fail ((src_x + src_width) <= gimp_item_width (item), NULL);
- g_return_val_if_fail ((src_y + src_height) <= gimp_item_height (item), NULL);
+ g_return_val_if_fail ((src_x + src_width) <= gimp_item_get_width (item), NULL);
+ g_return_val_if_fail ((src_y + src_height) <= gimp_item_get_height (item), NULL);
image = gimp_item_get_image (item);
@@ -181,8 +181,8 @@
ret_buf = gimp_drawable_get_sub_preview (drawable,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
width,
height);
Modified: trunk/app/core/gimpdrawable-shadow.c
==============================================================================
--- trunk/app/core/gimpdrawable-shadow.c (original)
+++ trunk/app/core/gimpdrawable-shadow.c Mon Nov 3 00:09:01 2008
@@ -40,8 +40,8 @@
if (drawable->shadow)
{
- if ((gimp_item_width (item) != tile_manager_width (drawable->shadow)) ||
- (gimp_item_height (item) != tile_manager_height (drawable->shadow)) ||
+ if ((gimp_item_get_width (item) != tile_manager_width (drawable->shadow)) ||
+ (gimp_item_get_height (item) != tile_manager_height (drawable->shadow)) ||
(drawable->bytes != tile_manager_bpp (drawable->shadow)))
{
gimp_drawable_free_shadow_tiles (drawable);
@@ -52,8 +52,8 @@
}
}
- drawable->shadow = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ drawable->shadow = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
drawable->bytes);
return drawable->shadow;
Modified: trunk/app/core/gimpdrawable-stroke.c
==============================================================================
--- trunk/app/core/gimpdrawable-stroke.c (original)
+++ trunk/app/core/gimpdrawable-stroke.c Mon Nov 3 00:09:01 2008
@@ -337,8 +337,8 @@
{
x = 0;
y = 0;
- w = gimp_item_width (GIMP_ITEM (drawable));
- h = gimp_item_height (GIMP_ITEM (drawable));
+ w = gimp_item_get_width (GIMP_ITEM (drawable));
+ h = gimp_item_get_height (GIMP_ITEM (drawable));
}
else if (! gimp_drawable_mask_intersect (drawable, &x, &y, &w, &h))
{
Modified: trunk/app/core/gimpdrawable.c
==============================================================================
--- trunk/app/core/gimpdrawable.c (original)
+++ trunk/app/core/gimpdrawable.c Mon Nov 3 00:09:01 2008
@@ -301,8 +301,8 @@
{
GimpItem *item = GIMP_ITEM (viewable);
- *width = gimp_item_width (item);
- *height = gimp_item_height (item);
+ *width = gimp_item_get_width (item);
+ *height = gimp_item_get_height (item);
return TRUE;
}
@@ -384,20 +384,20 @@
gimp_item_get_image (item),
item->offset_x,
item->offset_y,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
gimp_drawable_type (drawable),
GIMP_OBJECT (new_drawable)->name);
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
pixel_region_init (&destPR, gimp_drawable_get_tiles (new_drawable),
0, 0,
- gimp_item_width (new_item),
- gimp_item_height (new_item),
+ gimp_item_get_width (new_item),
+ gimp_item_get_height (new_item),
TRUE);
copy_region (&srcPR, &destPR);
@@ -442,8 +442,8 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
@@ -484,8 +484,8 @@
gint copy_width, copy_height;
/* if the size doesn't change, this is a nop */
- if (new_width == gimp_item_width (item) &&
- new_height == gimp_item_height (item) &&
+ if (new_width == gimp_item_get_width (item) &&
+ new_height == gimp_item_get_height (item) &&
offset_x == 0 &&
offset_y == 0)
return;
@@ -494,8 +494,8 @@
new_offset_y = item->offset_y - offset_y;
gimp_rectangle_intersect (item->offset_x, item->offset_y,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
new_offset_x, new_offset_y,
new_width, new_height,
©_x, ©_y,
@@ -661,8 +661,8 @@
GimpDrawable *drawable = GIMP_DRAWABLE (pickable);
/* do not make this a g_return_if_fail() */
- if (x < 0 || x >= gimp_item_width (GIMP_ITEM (drawable)) ||
- y < 0 || y >= gimp_item_height (GIMP_ITEM (drawable)))
+ if (x < 0 || x >= gimp_item_get_width (GIMP_ITEM (drawable)) ||
+ y < 0 || y >= gimp_item_get_height (GIMP_ITEM (drawable)))
return FALSE;
read_pixel_data_1 (gimp_drawable_get_tiles (drawable), x, y, pixel);
@@ -750,8 +750,8 @@
gimp_item_set_offset (item, offset_x, offset_y);
- if (gimp_item_width (item) != tile_manager_width (tiles) ||
- gimp_item_height (item) != tile_manager_height (tiles))
+ if (gimp_item_get_width (item) != tile_manager_width (tiles) ||
+ gimp_item_get_height (item) != tile_manager_height (tiles))
{
item->width = tile_manager_width (tiles);
item->height = tile_manager_height (tiles);
@@ -1086,15 +1086,15 @@
if (! gimp_item_is_attached (GIMP_ITEM (drawable)))
push_undo = FALSE;
- if (gimp_item_width (item) != tile_manager_width (tiles) ||
- gimp_item_height (item) != tile_manager_height (tiles) ||
+ if (gimp_item_get_width (item) != tile_manager_width (tiles) ||
+ gimp_item_get_height (item) != tile_manager_height (tiles) ||
item->offset_x != offset_x ||
item->offset_y != offset_y)
{
gimp_drawable_update (drawable,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
}
if (gimp_drawable_has_floating_sel (drawable))
@@ -1110,8 +1110,8 @@
gimp_drawable_update (drawable,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
}
GeglNode *
@@ -1181,9 +1181,9 @@
g_return_if_fail (gimp_item_is_attached (item));
g_return_if_fail (sparse == FALSE ||
- tile_manager_width (tiles) == gimp_item_width (item));
+ tile_manager_width (tiles) == gimp_item_get_width (item));
g_return_if_fail (sparse == FALSE ||
- tile_manager_height (tiles) == gimp_item_height (item));
+ tile_manager_height (tiles) == gimp_item_get_height (item));
#if 0
g_printerr ("gimp_drawable_push_undo (%s, %d, %d, %d, %d)\n",
@@ -1193,8 +1193,8 @@
if (! gimp_rectangle_intersect (x1, y1,
x2 - x1, y2 - y1,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
&x, &y, &width, &height))
{
g_warning ("%s: tried to push empty region", G_STRFUNC);
@@ -1226,7 +1226,7 @@
drawable_type = gimp_drawable_type (drawable);
pixel_region_init (&destPR, gimp_drawable_get_tiles (drawable),
- 0, 0, gimp_item_width (item), gimp_item_height (item),
+ 0, 0, gimp_item_get_width (item), gimp_item_get_height (item),
TRUE);
if (color)
@@ -1265,8 +1265,8 @@
gimp_drawable_update (drawable,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
}
void
@@ -1342,10 +1342,10 @@
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));
- tmp_x2 = CLAMP (tmp_x2 - off_x, 0, gimp_item_width (item));
- tmp_y2 = CLAMP (tmp_y2 - off_y, 0, gimp_item_height (item));
+ tmp_x1 = CLAMP (tmp_x1 - off_x, 0, gimp_item_get_width (item));
+ tmp_y1 = CLAMP (tmp_y1 - off_y, 0, gimp_item_get_height (item));
+ tmp_x2 = CLAMP (tmp_x2 - off_x, 0, gimp_item_get_width (item));
+ tmp_y2 = CLAMP (tmp_y2 - off_y, 0, gimp_item_get_height (item));
retval = TRUE;
}
@@ -1353,8 +1353,8 @@
{
tmp_x1 = 0;
tmp_y1 = 0;
- tmp_x2 = gimp_item_width (item);
- tmp_y2 = gimp_item_height (item);
+ tmp_x2 = gimp_item_get_width (item);
+ tmp_y2 = gimp_item_get_height (item);
retval = FALSE;
}
@@ -1400,8 +1400,8 @@
retval = gimp_rectangle_intersect (tmp_x - off_x, tmp_y - off_y,
tmp_width - tmp_x, tmp_height - tmp_y,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
&tmp_x, &tmp_y,
&tmp_width, &tmp_height);
}
@@ -1409,8 +1409,8 @@
{
tmp_x = 0;
tmp_y = 0;
- tmp_width = gimp_item_width (item);
- tmp_height = gimp_item_height (item);
+ tmp_width = gimp_item_get_width (item);
+ tmp_height = gimp_item_get_height (item);
retval = TRUE;
}
Modified: trunk/app/core/gimpdrawablestack.c
==============================================================================
--- trunk/app/core/gimpdrawablestack.c (original)
+++ trunk/app/core/gimpdrawablestack.c Mon Nov 3 00:09:01 2008
@@ -415,6 +415,6 @@
gimp_drawable_stack_update (stack,
offset_x, offset_y,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
}
Modified: trunk/app/core/gimpfloatingselundo.c
==============================================================================
--- trunk/app/core/gimpfloatingselundo.c (original)
+++ trunk/app/core/gimpfloatingselundo.c Mon Nov 3 00:09:01 2008
@@ -141,8 +141,8 @@
floating_sel_store (floating_layer,
GIMP_ITEM (floating_layer)->offset_x,
GIMP_ITEM (floating_layer)->offset_y,
- gimp_item_width (GIMP_ITEM (floating_layer)),
- gimp_item_height (GIMP_ITEM (floating_layer)));
+ gimp_item_get_width (GIMP_ITEM (floating_layer)),
+ gimp_item_get_height (GIMP_ITEM (floating_layer)));
floating_layer->fs.initial = TRUE;
/* clear the selection */
@@ -154,8 +154,8 @@
floating_sel_restore (floating_layer,
GIMP_ITEM (floating_layer)->offset_x,
GIMP_ITEM (floating_layer)->offset_y,
- gimp_item_width (GIMP_ITEM (floating_layer)),
- gimp_item_height (GIMP_ITEM (floating_layer)));
+ gimp_item_get_width (GIMP_ITEM (floating_layer)),
+ gimp_item_get_height (GIMP_ITEM (floating_layer)));
/* Update the preview for the underlying drawable */
gimp_viewable_invalidate_preview (GIMP_VIEWABLE (floating_layer));
@@ -172,8 +172,8 @@
gimp_drawable_update (GIMP_DRAWABLE (floating_layer),
0, 0,
- gimp_item_width (GIMP_ITEM (floating_layer)),
- gimp_item_height (GIMP_ITEM (floating_layer)));
+ gimp_item_get_width (GIMP_ITEM (floating_layer)),
+ gimp_item_get_height (GIMP_ITEM (floating_layer)));
gimp_image_floating_selection_changed (undo->image);
break;
Modified: trunk/app/core/gimpimage-arrange.c
==============================================================================
--- trunk/app/core/gimpimage-arrange.c (original)
+++ trunk/app/core/gimpimage-arrange.c Mon Nov 3 00:09:01 2008
@@ -260,8 +260,8 @@
GimpItem *item = GIMP_ITEM (object);
gimp_item_get_offset (item, &object_offset_x, &object_offset_y);
- object_height = gimp_item_height (item);
- object_width = gimp_item_width (item);
+ object_width = gimp_item_get_width (item);
+ object_height = gimp_item_get_height (item);
}
else
{
@@ -270,8 +270,8 @@
gimp_channel_bounds (channel, &x1, &y1, &x2, &y2);
object_offset_x = x1;
object_offset_y = y1;
- object_height = y2 - y1;
object_width = x2 - x1;
+ object_height = y2 - y1;
}
}
else if (GIMP_IS_ITEM (object))
@@ -288,14 +288,14 @@
object_offset_x = ROUND (x1_f);
object_offset_y = ROUND (y1_f);
- object_width = ROUND (x2_f - x1_f);
object_height = ROUND (y2_f - y1_f);
+ object_width = ROUND (x2_f - x1_f);
}
else
{
gimp_item_get_offset (item, &object_offset_x, &object_offset_y);
- object_height = gimp_item_height (item);
- object_width = gimp_item_width (item);
+ object_width = gimp_item_get_width (item);
+ object_height = gimp_item_get_height (item);
}
}
else if (GIMP_IS_GUIDE (object))
Modified: trunk/app/core/gimpimage-contiguous-region.c
==============================================================================
--- trunk/app/core/gimpimage-contiguous-region.c (original)
+++ trunk/app/core/gimpimage-contiguous-region.c Mon Nov 3 00:09:01 2008
@@ -148,8 +148,8 @@
mask = gimp_channel_new_mask (image, srcPR.w, srcPR.h);
pixel_region_init (&maskPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
0, 0,
- gimp_item_width (GIMP_ITEM (mask)),
- gimp_item_height (GIMP_ITEM (mask)),
+ gimp_item_get_width (GIMP_ITEM (mask)),
+ gimp_item_get_height (GIMP_ITEM (mask)),
TRUE);
tile = tile_manager_get_tile (srcPR.tiles, x, y, TRUE, FALSE);
Modified: trunk/app/core/gimpimage-convert.c
==============================================================================
--- trunk/app/core/gimpimage-convert.c (original)
+++ trunk/app/core/gimpimage-convert.c Mon Nov 3 00:09:01 2008
@@ -692,13 +692,13 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
pixel_region_init (&destPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
for (pr = pixel_regions_register (2, &srcPR, &destPR);
@@ -968,8 +968,8 @@
if (gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
new_layer_type = GIMP_IMAGE_TYPE_WITH_ALPHA (new_layer_type);
- new_tiles = tile_manager_new (gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ new_tiles = tile_manager_new (gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
GIMP_IMAGE_TYPE_BYTES (new_layer_type));
switch (new_type)
@@ -1120,8 +1120,8 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
for (pr = pixel_regions_register (1, &srcPR);
@@ -1179,12 +1179,12 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
- layer_size = (gimp_item_width (GIMP_ITEM (layer)) *
- gimp_item_height (GIMP_ITEM (layer)));
+ layer_size = (gimp_item_get_width (GIMP_ITEM (layer)) *
+ gimp_item_get_height (GIMP_ITEM (layer)));
if (progress)
gimp_progress_set_value (progress, 0.0);
@@ -2776,13 +2776,13 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
for (pr = pixel_regions_register (2, &srcPR, &destPR);
@@ -2873,13 +2873,13 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
for (pr = pixel_regions_register (2, &srcPR, &destPR);
@@ -3033,17 +3033,17 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
- layer_size = (gimp_item_width (GIMP_ITEM (layer)) *
- gimp_item_height (GIMP_ITEM (layer)));
+ layer_size = (gimp_item_get_width (GIMP_ITEM (layer)) *
+ gimp_item_get_height (GIMP_ITEM (layer)));
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
@@ -3158,17 +3158,17 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
- layer_size = (gimp_item_width (GIMP_ITEM (layer)) *
- gimp_item_height (GIMP_ITEM (layer)));
+ layer_size = (gimp_item_get_width (GIMP_ITEM (layer)) *
+ gimp_item_get_height (GIMP_ITEM (layer)));
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
@@ -3352,12 +3352,12 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
pixel_region_init (&destPR, new_tiles, 0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
for (pr = pixel_regions_register (2, &srcPR, &destPR);
@@ -3566,18 +3566,18 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
pixel_region_init (&destPR, new_tiles, 0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
src_bytes = GIMP_DRAWABLE (layer)->bytes;
dest_bytes = tile_manager_bpp (new_tiles);
- width = gimp_item_width (GIMP_ITEM (layer));
- height = gimp_item_height (GIMP_ITEM (layer));
+ width = gimp_item_get_width (GIMP_ITEM (layer));
+ height = gimp_item_get_height (GIMP_ITEM (layer));
error_limiter = init_error_limit (quantobj->error_freedom);
range_limiter = range_array + 256;
@@ -3832,18 +3832,18 @@
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
FALSE);
pixel_region_init (&destPR, new_tiles, 0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
src_bytes = GIMP_DRAWABLE(layer)->bytes;
dest_bytes = tile_manager_bpp (new_tiles);
- width = gimp_item_width (GIMP_ITEM (layer));
- height = gimp_item_height (GIMP_ITEM (layer));
+ width = gimp_item_get_width (GIMP_ITEM (layer));
+ height = gimp_item_get_height (GIMP_ITEM (layer));
error_limiter = init_error_limit (quantobj->error_freedom);
range_limiter = range_array + 256;
Modified: trunk/app/core/gimpimage-crop.c
==============================================================================
--- trunk/app/core/gimpimage-crop.c (original)
+++ trunk/app/core/gimpimage-crop.c Mon Nov 3 00:09:01 2008
@@ -189,9 +189,9 @@
lx1 = CLAMP (off_x, 0, gimp_image_get_width (image));
ly1 = CLAMP (off_y, 0, gimp_image_get_height (image));
- lx2 = CLAMP (gimp_item_width (item) + off_x,
+ lx2 = CLAMP (gimp_item_get_width (item) + off_x,
0, gimp_image_get_width (image));
- ly2 = CLAMP (gimp_item_height (item) + off_y,
+ ly2 = CLAMP (gimp_item_get_height (item) + off_y,
0, gimp_image_get_height (image));
width = lx2 - lx1;
Modified: trunk/app/core/gimpimage-merge.c
==============================================================================
--- trunk/app/core/gimpimage-merge.c (original)
+++ trunk/app/core/gimpimage-merge.c Mon Nov 3 00:09:01 2008
@@ -354,8 +354,8 @@
{
x1 = off_x;
y1 = off_y;
- x2 = off_x + gimp_item_width (GIMP_ITEM (layer));
- y2 = off_y + gimp_item_height (GIMP_ITEM (layer));
+ x2 = off_x + gimp_item_get_width (GIMP_ITEM (layer));
+ y2 = off_y + gimp_item_get_height (GIMP_ITEM (layer));
}
else
{
@@ -363,10 +363,10 @@
x1 = off_x;
if (off_y < y1)
y1 = off_y;
- if ((off_x + gimp_item_width (GIMP_ITEM (layer))) > x2)
- x2 = (off_x + gimp_item_width (GIMP_ITEM (layer)));
- if ((off_y + gimp_item_height (GIMP_ITEM (layer))) > y2)
- y2 = (off_y + gimp_item_height (GIMP_ITEM (layer)));
+ if ((off_x + gimp_item_get_width (GIMP_ITEM (layer))) > x2)
+ x2 = (off_x + gimp_item_get_width (GIMP_ITEM (layer)));
+ if ((off_y + gimp_item_get_height (GIMP_ITEM (layer))) > y2)
+ y2 = (off_y + gimp_item_get_height (GIMP_ITEM (layer)));
}
if (merge_type == GIMP_CLIP_TO_IMAGE)
@@ -383,8 +383,8 @@
{
x1 = off_x;
y1 = off_y;
- x2 = off_x + gimp_item_width (GIMP_ITEM (layer));
- y2 = off_y + gimp_item_height (GIMP_ITEM (layer));
+ x2 = off_x + gimp_item_get_width (GIMP_ITEM (layer));
+ y2 = off_y + gimp_item_get_height (GIMP_ITEM (layer));
}
break;
@@ -529,8 +529,8 @@
x3 = CLAMP (off_x, x1, x2);
y3 = CLAMP (off_y, y1, y2);
- x4 = CLAMP (off_x + gimp_item_width (GIMP_ITEM (layer)), x1, x2);
- y4 = CLAMP (off_y + gimp_item_height (GIMP_ITEM (layer)), y1, y2);
+ x4 = CLAMP (off_x + gimp_item_get_width (GIMP_ITEM (layer)), x1, x2);
+ y4 = CLAMP (off_y + gimp_item_get_height (GIMP_ITEM (layer)), y1, y2);
/* configure the pixel regions */
pixel_region_init (&src1PR,
@@ -616,8 +616,8 @@
gimp_drawable_update (GIMP_DRAWABLE (merge_layer),
0, 0,
- gimp_item_width (GIMP_ITEM (merge_layer)),
- gimp_item_height (GIMP_ITEM (merge_layer)));
+ gimp_item_get_width (GIMP_ITEM (merge_layer)),
+ gimp_item_get_height (GIMP_ITEM (merge_layer)));
return merge_layer;
}
Modified: trunk/app/core/gimpimage-resize.c
==============================================================================
--- trunk/app/core/gimpimage-resize.c (original)
+++ trunk/app/core/gimpimage-resize.c Mon Nov 3 00:09:01 2008
@@ -253,8 +253,8 @@
item = list->data;
min_x = item->offset_x;
min_y = item->offset_y;
- max_x = item->offset_x + gimp_item_width (item);
- max_y = item->offset_y + gimp_item_height (item);
+ max_x = item->offset_x + gimp_item_get_width (item);
+ max_y = item->offset_y + gimp_item_get_height (item);
/* Respect all layers */
for (list = g_list_next (list);
@@ -265,8 +265,8 @@
min_x = MIN (min_x, item->offset_x);
min_y = MIN (min_y, item->offset_y);
- max_x = MAX (max_x, item->offset_x + gimp_item_width (item));
- max_y = MAX (max_y, item->offset_y + gimp_item_height (item));
+ max_x = MAX (max_x, item->offset_x + gimp_item_get_width (item));
+ max_y = MAX (max_y, item->offset_y + gimp_item_get_height (item));
}
gimp_image_resize (image, context,
Modified: trunk/app/core/gimpimage-rotate.c
==============================================================================
--- trunk/app/core/gimpimage-rotate.c (original)
+++ trunk/app/core/gimpimage-rotate.c Mon Nov 3 00:09:01 2008
@@ -243,13 +243,13 @@
switch (rotate_type)
{
case GIMP_ROTATE_90:
- x = gimp_image_get_height (image) - off_y - gimp_item_width (item);
+ x = gimp_image_get_height (image) - off_y - gimp_item_get_width (item);
y = off_x;
break;
case GIMP_ROTATE_270:
x = off_y;
- y = gimp_image_get_width (image) - off_x - gimp_item_height (item);
+ y = gimp_image_get_width (image) - off_x - gimp_item_get_height (item);
break;
case GIMP_ROTATE_180:
Modified: trunk/app/core/gimpimage-scale.c
==============================================================================
--- trunk/app/core/gimpimage-scale.c (original)
+++ trunk/app/core/gimpimage-scale.c Mon Nov 3 00:09:01 2008
@@ -282,8 +282,8 @@
for (list = drawables; list; list = g_list_next (list))
{
GimpDrawable *drawable = list->data;
- gdouble width = gimp_item_width (GIMP_ITEM (drawable));
- gdouble height = gimp_item_height (GIMP_ITEM (drawable));
+ gdouble width = gimp_item_get_width (GIMP_ITEM (drawable));
+ gdouble height = gimp_item_get_height (GIMP_ITEM (drawable));
scalable_size +=
gimp_drawable_estimate_memsize (drawable,
Modified: trunk/app/core/gimpimage-undo-push.c
==============================================================================
--- trunk/app/core/gimpimage-undo-push.c (original)
+++ trunk/app/core/gimpimage-undo-push.c Mon Nov 3 00:09:01 2008
@@ -232,10 +232,10 @@
g_return_val_if_fail (gimp_item_is_attached (item), NULL);
g_return_val_if_fail (sparse == FALSE ||
- tile_manager_width (tiles) == gimp_item_width (item),
+ tile_manager_width (tiles) == gimp_item_get_width (item),
NULL);
g_return_val_if_fail (sparse == FALSE ||
- tile_manager_height (tiles) == gimp_item_height (item),
+ tile_manager_height (tiles) == gimp_item_get_height (item),
NULL);
return gimp_image_undo_push (image, GIMP_TYPE_DRAWABLE_UNDO,
Modified: trunk/app/core/gimpimage.c
==============================================================================
--- trunk/app/core/gimpimage.c (original)
+++ trunk/app/core/gimpimage.c Mon Nov 3 00:09:01 2008
@@ -1601,8 +1601,8 @@
floating_sel_rigor (floating_sel, FALSE);
gimp_drawable_update (GIMP_DRAWABLE (floating_sel),
0, 0,
- gimp_item_width (GIMP_ITEM (floating_sel)),
- gimp_item_height (GIMP_ITEM (floating_sel)));
+ gimp_item_get_width (GIMP_ITEM (floating_sel)),
+ gimp_item_get_height (GIMP_ITEM (floating_sel)));
}
/* If there is an active channel and we mess with the components,
@@ -3071,9 +3071,9 @@
layers_y = MIN (layers_y, off_y);
layers_width = MAX (layers_width,
- off_x + gimp_item_width (item) - layers_x);
+ off_x + gimp_item_get_width (item) - layers_x);
layers_height = MAX (layers_height,
- off_y + gimp_item_height (item) - layers_y);
+ off_y + gimp_item_get_height (item) - layers_y);
}
offset_x = x + (width - layers_width) / 2 - layers_x;
@@ -3734,8 +3734,8 @@
d_x = x - off_x;
d_y = y - off_y;
- if (d_x >= 0 && d_x < gimp_item_width (item) &&
- d_y >= 0 && d_y < gimp_item_height (item))
+ if (d_x >= 0 && d_x < gimp_item_get_width (item) &&
+ d_y >= 0 && d_y < gimp_item_get_height (item))
in_pickable = TRUE;
}
}
Modified: trunk/app/core/gimpimagemap.c
==============================================================================
--- trunk/app/core/gimpimagemap.c (original)
+++ trunk/app/core/gimpimagemap.c Mon Nov 3 00:09:01 2008
@@ -290,8 +290,8 @@
GimpImageMap *image_map = GIMP_IMAGE_MAP (pickable);
GimpItem *item = GIMP_ITEM (image_map->drawable);
- if (x >= 0 && x < gimp_item_width (item) &&
- y >= 0 && y < gimp_item_height (item))
+ if (x >= 0 && x < gimp_item_get_width (item) &&
+ y >= 0 && y < gimp_item_get_height (item))
{
/* Check if done damage to original image */
if (image_map->undo_tiles)
Modified: trunk/app/core/gimpitem-preview.c
==============================================================================
--- trunk/app/core/gimpitem-preview.c (original)
+++ trunk/app/core/gimpitem-preview.c Mon Nov 3 00:09:01 2008
@@ -74,8 +74,8 @@
}
else
{
- gimp_viewable_calc_preview_size (gimp_item_width (item),
- gimp_item_height (item),
+ gimp_viewable_calc_preview_size (gimp_item_get_width (item),
+ gimp_item_get_height (item),
size,
size,
dot_for_dot, 1.0, 1.0,
@@ -99,8 +99,8 @@
if (image && ! image->gimp->config->layer_previews)
return FALSE;
- if (gimp_item_width (item) > width ||
- gimp_item_height (item) > height)
+ if (gimp_item_get_width (item) > width ||
+ gimp_item_get_height (item) > height)
{
gboolean scaling_up;
gdouble xres = 1.0;
@@ -109,8 +109,8 @@
if (image)
gimp_image_get_resolution (image, &xres, &yres);
- gimp_viewable_calc_preview_size (gimp_item_width (item),
- gimp_item_height (item),
+ gimp_viewable_calc_preview_size (gimp_item_get_width (item),
+ gimp_item_get_height (item),
width * 2,
height * 2,
dot_for_dot,
@@ -122,8 +122,8 @@
if (scaling_up)
{
- *popup_width = gimp_item_width (item);
- *popup_width = gimp_item_height (item);
+ *popup_width = gimp_item_get_width (item);
+ *popup_width = gimp_item_get_height (item);
}
return TRUE;
Modified: trunk/app/core/gimpitem.c
==============================================================================
--- trunk/app/core/gimpitem.c (original)
+++ trunk/app/core/gimpitem.c Mon Nov 3 00:09:01 2008
@@ -366,8 +366,8 @@
gimp_item_configure (new_item, gimp_item_get_image (item),
item->offset_x, item->offset_y,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
new_name);
g_free (new_name);
@@ -660,13 +660,13 @@
}
/**
- * gimp_item_width:
+ * gimp_item_get_width:
* @item: The #GimpItem to check.
*
* Returns: The width of the item.
*/
gint
-gimp_item_width (const GimpItem *item)
+gimp_item_get_width (const GimpItem *item)
{
g_return_val_if_fail (GIMP_IS_ITEM (item), -1);
@@ -674,13 +674,13 @@
}
/**
- * gimp_item_height:
+ * gimp_item_get_height:
* @item: The #GimpItem to check.
*
* Returns: The height of the item.
*/
gint
-gimp_item_height (const GimpItem *item)
+gimp_item_get_height (const GimpItem *item)
{
g_return_val_if_fail (GIMP_IS_ITEM (item), -1);
@@ -786,8 +786,8 @@
(gdouble) gimp_image_get_width (image));
img_scale_h = ((gdouble) new_height /
(gdouble) gimp_image_get_height (image));
- new_item_width = ROUND (img_scale_w * (gdouble) gimp_item_width (item));
- new_item_height = ROUND (img_scale_h * (gdouble) gimp_item_height (item));
+ new_item_width = ROUND (img_scale_w * (gdouble) gimp_item_get_width (item));
+ new_item_height = ROUND (img_scale_h * (gdouble) gimp_item_get_height (item));
return (new_item_width > 0 && new_item_height > 0);
}
@@ -874,8 +874,8 @@
new_offset_x = ROUND (w_factor * (gdouble) item->offset_x);
new_offset_y = ROUND (h_factor * (gdouble) item->offset_y);
- new_width = ROUND (w_factor * (gdouble) gimp_item_width (item));
- new_height = ROUND (h_factor * (gdouble) gimp_item_height (item));
+ new_width = ROUND (w_factor * (gdouble) gimp_item_get_width (item));
+ new_height = ROUND (h_factor * (gdouble) gimp_item_get_height (item));
if (new_width != 0 && new_height != 0)
{
@@ -939,19 +939,19 @@
if (local_origin)
{
new_offset_x = (item->offset_x +
- ((gimp_item_width (item) - new_width) / 2.0));
+ ((gimp_item_get_width (item) - new_width) / 2.0));
new_offset_y = (item->offset_y +
- ((gimp_item_height (item) - new_height) / 2.0));
+ ((gimp_item_get_height (item) - new_height) / 2.0));
}
else
{
new_offset_x = (gint) (((gdouble) new_width *
(gdouble) item->offset_x /
- (gdouble) gimp_item_width (item)));
+ (gdouble) gimp_item_get_width (item)));
new_offset_y = (gint) (((gdouble) new_height *
(gdouble) item->offset_y /
- (gdouble) gimp_item_height (item)));
+ (gdouble) gimp_item_get_height (item)));
}
gimp_item_scale (item,
@@ -1419,8 +1419,8 @@
return TRUE;
case GIMP_ITEM_SET_IMAGE_SIZED:
- return (gimp_item_width (item) == gimp_image_get_width (item->image) &&
- gimp_item_height (item) == gimp_image_get_height (item->image));
+ return (gimp_item_get_width (item) == gimp_image_get_width (item->image) &&
+ gimp_item_get_height (item) == gimp_image_get_height (item->image));
case GIMP_ITEM_SET_VISIBLE:
return gimp_item_get_visible (item);
Modified: trunk/app/core/gimpitem.h
==============================================================================
--- trunk/app/core/gimpitem.h (original)
+++ trunk/app/core/gimpitem.h Mon Nov 3 00:09:01 2008
@@ -157,8 +157,8 @@
const gchar *new_name,
GError **error);
-gint gimp_item_width (const GimpItem *item);
-gint gimp_item_height (const GimpItem *item);
+gint gimp_item_get_width (const GimpItem *item);
+gint gimp_item_get_height (const GimpItem *item);
void gimp_item_get_offset (const GimpItem *item,
gint *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 Mon Nov 3 00:09:01 2008
@@ -74,8 +74,8 @@
/* set the drawable and allocate a backing store */
gimp_layer_set_lock_alpha (layer, TRUE, FALSE);
layer->fs.drawable = drawable;
- layer->fs.backing_store = tile_manager_new (gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ layer->fs.backing_store = tile_manager_new (gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
gimp_drawable_bytes (drawable));
/* add the layer to the image */
@@ -141,8 +141,8 @@
floating_sel_composite (layer,
GIMP_ITEM (layer)->offset_x,
GIMP_ITEM (layer)->offset_y,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
TRUE);
drawable = layer->fs.drawable;
@@ -214,8 +214,8 @@
floating_sel_restore (layer,
item->offset_x,
item->offset_y,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
gimp_image_undo_push_fs_to_layer (image, NULL, layer);
@@ -235,8 +235,8 @@
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
gimp_image_floating_selection_changed (image);
@@ -259,9 +259,9 @@
/* Check the backing store & make sure it has the correct dimensions */
if ((tile_manager_width (layer->fs.backing_store) !=
- gimp_item_width (GIMP_ITEM(layer))) ||
+ gimp_item_get_width (GIMP_ITEM(layer))) ||
(tile_manager_height (layer->fs.backing_store) !=
- gimp_item_height (GIMP_ITEM(layer))) ||
+ gimp_item_get_height (GIMP_ITEM(layer))) ||
(tile_manager_bpp (layer->fs.backing_store) !=
gimp_drawable_bytes (layer->fs.drawable)))
{
@@ -269,8 +269,8 @@
tile_manager_unref (layer->fs.backing_store);
layer->fs.backing_store =
- tile_manager_new (gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)),
+ tile_manager_new (gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)),
gimp_drawable_bytes (layer->fs.drawable));
}
@@ -283,10 +283,10 @@
/* Find the minimum area we need to uncover -- in image space */
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
y1 = MAX (GIMP_ITEM (layer)->offset_y, offy);
- x2 = MIN (GIMP_ITEM (layer)->offset_x + gimp_item_width (GIMP_ITEM (layer)),
- offx + gimp_item_width (GIMP_ITEM (layer->fs.drawable)));
- y2 = MIN (GIMP_ITEM (layer)->offset_y + gimp_item_height (GIMP_ITEM (layer)),
- offy + gimp_item_height (GIMP_ITEM (layer->fs.drawable)));
+ x2 = MIN (GIMP_ITEM (layer)->offset_x + gimp_item_get_width (GIMP_ITEM (layer)),
+ offx + gimp_item_get_width (GIMP_ITEM (layer->fs.drawable)));
+ y2 = MIN (GIMP_ITEM (layer)->offset_y + gimp_item_get_height (GIMP_ITEM (layer)),
+ offy + gimp_item_get_height (GIMP_ITEM (layer->fs.drawable)));
x1 = CLAMP (x, x1, x2);
y1 = CLAMP (y, y1, y2);
@@ -332,10 +332,10 @@
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
y1 = MAX (GIMP_ITEM (layer)->offset_y, offy);
- x2 = MIN (GIMP_ITEM (layer)->offset_x + gimp_item_width (GIMP_ITEM (layer)),
- offx + gimp_item_width (GIMP_ITEM (layer->fs.drawable)));
- y2 = MIN (GIMP_ITEM(layer)->offset_y + gimp_item_height (GIMP_ITEM (layer)),
- offy + gimp_item_height (GIMP_ITEM (layer->fs.drawable)));
+ x2 = MIN (GIMP_ITEM (layer)->offset_x + gimp_item_get_width (GIMP_ITEM (layer)),
+ offx + gimp_item_get_width (GIMP_ITEM (layer->fs.drawable)));
+ y2 = MIN (GIMP_ITEM (layer)->offset_y + gimp_item_get_height (GIMP_ITEM (layer)),
+ offy + gimp_item_get_height (GIMP_ITEM (layer->fs.drawable)));
x1 = CLAMP (x, x1, x2);
y1 = CLAMP (y, y1, y2);
@@ -367,8 +367,8 @@
floating_sel_store (layer,
GIMP_ITEM (layer)->offset_x,
GIMP_ITEM (layer)->offset_y,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)));
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)));
layer->fs.initial = TRUE;
if (push_undo)
@@ -389,8 +389,8 @@
floating_sel_restore (layer,
GIMP_ITEM (layer)->offset_x,
GIMP_ITEM (layer)->offset_y,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)));
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)));
layer->fs.initial = TRUE;
if (push_undo)
@@ -442,11 +442,11 @@
x1 = MAX (GIMP_ITEM (layer)->offset_x, offx);
y1 = MAX (GIMP_ITEM (layer)->offset_y, offy);
x2 = MIN (GIMP_ITEM (layer)->offset_x +
- gimp_item_width (GIMP_ITEM (layer)),
- offx + gimp_item_width (GIMP_ITEM (layer->fs.drawable)));
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ offx + gimp_item_get_width (GIMP_ITEM (layer->fs.drawable)));
y2 = MIN (GIMP_ITEM (layer)->offset_y +
- gimp_item_height (GIMP_ITEM (layer)),
- offy + gimp_item_height (GIMP_ITEM (layer->fs.drawable)));
+ gimp_item_get_height (GIMP_ITEM (layer)),
+ offy + gimp_item_get_height (GIMP_ITEM (layer->fs.drawable)));
x1 = CLAMP (x, x1, x2);
y1 = CLAMP (y, y1, y2);
@@ -512,8 +512,8 @@
gint width, height;
gint off_x, off_y;
- width = gimp_item_width (GIMP_ITEM (layer));
- height = gimp_item_height (GIMP_ITEM (layer));
+ width = gimp_item_get_width (GIMP_ITEM (layer));
+ height = gimp_item_get_height (GIMP_ITEM (layer));
gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
if (layer->fs.segs)
Modified: trunk/app/core/gimplayer.c
==============================================================================
--- trunk/app/core/gimplayer.c (original)
+++ trunk/app/core/gimplayer.c Mon Nov 3 00:09:01 2008
@@ -635,8 +635,8 @@
if (gimp_drawable_has_alpha (drawable))
new_type = GIMP_IMAGE_TYPE_WITH_ALPHA (new_type);
- new_tiles = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ new_tiles = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
GIMP_IMAGE_TYPE_BYTES (new_type));
switch (new_base_type)
@@ -660,13 +660,13 @@
pixel_region_init (&layerPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
pixel_region_init (&newPR, new_tiles,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
TRUE);
gimp_layer_transform_color (dest_image,
@@ -745,8 +745,8 @@
/* update the old region */
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
/* invalidate the selection boundary because of a layer modification */
gimp_drawable_invalidate_boundary (GIMP_DRAWABLE (layer));
@@ -763,8 +763,8 @@
/* update the new region */
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
if (layer->mask)
{
@@ -939,8 +939,8 @@
Tile *tile;
gint val = 0;
- if (x >= 0 && x < gimp_item_width (GIMP_ITEM (layer)) &&
- y >= 0 && y < gimp_item_height (GIMP_ITEM (layer)) &&
+ if (x >= 0 && x < gimp_item_get_width (GIMP_ITEM (layer)) &&
+ y >= 0 && y < gimp_item_get_height (GIMP_ITEM (layer)) &&
gimp_item_get_visible (GIMP_ITEM (layer)))
{
/* If the point is inside, and the layer has no
@@ -1335,10 +1335,10 @@
return NULL;
}
- if ((gimp_item_width (GIMP_ITEM (layer)) !=
- gimp_item_width (GIMP_ITEM (mask))) ||
- (gimp_item_height (GIMP_ITEM (layer)) !=
- gimp_item_height (GIMP_ITEM (mask))))
+ if ((gimp_item_get_width (GIMP_ITEM (layer)) !=
+ gimp_item_get_width (GIMP_ITEM (mask))) ||
+ (gimp_item_get_height (GIMP_ITEM (layer)) !=
+ gimp_item_get_height (GIMP_ITEM (mask))))
{
g_set_error (error, 0, 0,
_("Cannot add layer mask of different "
@@ -1369,8 +1369,8 @@
{
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)));
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)));
}
g_signal_connect (mask, "update",
@@ -1408,8 +1408,8 @@
gimp_object_get_name (GIMP_OBJECT (layer)));
mask = gimp_layer_mask_new (image,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
mask_name, &black);
g_free (mask_name);
@@ -1430,8 +1430,8 @@
pixel_region_init (&destPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
0, 0,
- gimp_item_width (GIMP_ITEM (mask)),
- gimp_item_height (GIMP_ITEM (mask)),
+ gimp_item_get_width (GIMP_ITEM (mask)),
+ gimp_item_get_height (GIMP_ITEM (mask)),
TRUE);
switch (add_mask_type)
@@ -1446,8 +1446,8 @@
{
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
extract_alpha_region (&srcPR, NULL, &destPR);
@@ -1461,14 +1461,14 @@
gimp_drawable_push_undo (drawable,
_("Transfer Alpha to Mask"),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
NULL, FALSE);
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
TRUE);
for (pr = pixel_regions_register (1, &srcPR);
@@ -1510,13 +1510,13 @@
gimp_image_get_width (image),
gimp_image_get_height (image),
item->offset_x, item->offset_y,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
©_x, ©_y,
©_width, ©_height);
- if (copy_width < gimp_item_width (item) ||
- copy_height < gimp_item_height (item) ||
+ if (copy_width < gimp_item_get_width (item) ||
+ copy_height < gimp_item_get_height (item) ||
channel_empty)
gimp_channel_clear (GIMP_CHANNEL (mask), NULL, FALSE);
@@ -1554,8 +1554,8 @@
copy_type = (GIMP_IMAGE_TYPE_HAS_ALPHA (layer_type) ?
GIMP_GRAYA_IMAGE : GIMP_GRAY_IMAGE);
- copy_tiles = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ copy_tiles = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
GIMP_IMAGE_TYPE_BYTES (copy_type));
gimp_drawable_convert_grayscale (drawable,
@@ -1564,16 +1564,16 @@
pixel_region_init (&srcPR, copy_tiles,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
}
else
{
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
}
@@ -1656,22 +1656,22 @@
if (push_undo)
gimp_drawable_push_undo (GIMP_DRAWABLE (layer), NULL,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
NULL, FALSE);
/* Combine the current layer's alpha channel and the mask */
pixel_region_init (&srcPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
TRUE);
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (mask)),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
apply_mask_to_region (&srcPR, &maskPR, OPAQUE_OPACITY);
@@ -1696,8 +1696,8 @@
{
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
}
else
{
@@ -1725,20 +1725,20 @@
new_type = gimp_drawable_type_with_alpha (GIMP_DRAWABLE (layer));
/* Allocate the new tiles */
- new_tiles = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ new_tiles = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
GIMP_IMAGE_TYPE_BYTES (new_type));
/* Configure the pixel regions */
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
TRUE);
/* Add an alpha channel */
@@ -1779,20 +1779,20 @@
bg);
/* Allocate the new tiles */
- new_tiles = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ new_tiles = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
GIMP_IMAGE_TYPE_BYTES (new_type));
/* Configure the pixel regions */
pixel_region_init (&srcPR, gimp_drawable_get_tiles (GIMP_DRAWABLE (layer)),
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
TRUE);
/* Remove alpha channel */
@@ -1873,25 +1873,25 @@
new_segs[0].x1 = item->offset_x;
new_segs[0].y1 = item->offset_y;
new_segs[0].x2 = item->offset_x;
- new_segs[0].y2 = item->offset_y + gimp_item_height (item);
+ new_segs[0].y2 = item->offset_y + gimp_item_get_height (item);
new_segs[0].open = 1;
new_segs[1].x1 = item->offset_x;
new_segs[1].y1 = item->offset_y;
- new_segs[1].x2 = item->offset_x + gimp_item_width (item);
+ new_segs[1].x2 = item->offset_x + gimp_item_get_width (item);
new_segs[1].y2 = item->offset_y;
new_segs[1].open = 1;
- new_segs[2].x1 = item->offset_x + gimp_item_width (item);
+ new_segs[2].x1 = item->offset_x + gimp_item_get_width (item);
new_segs[2].y1 = item->offset_y;
- new_segs[2].x2 = item->offset_x + gimp_item_width (item);
- new_segs[2].y2 = item->offset_y + gimp_item_height (item);
+ new_segs[2].x2 = item->offset_x + gimp_item_get_width (item);
+ new_segs[2].y2 = item->offset_y + gimp_item_get_height (item);
new_segs[2].open = 0;
new_segs[3].x1 = item->offset_x;
- new_segs[3].y1 = item->offset_y + gimp_item_height (item);
- new_segs[3].x2 = item->offset_x + gimp_item_width (item);
- new_segs[3].y2 = item->offset_y + gimp_item_height (item);
+ new_segs[3].y1 = item->offset_y + gimp_item_get_height (item);
+ new_segs[3].x2 = item->offset_x + gimp_item_get_width (item);
+ new_segs[3].y2 = item->offset_y + gimp_item_get_height (item);
new_segs[3].open = 0;
return new_segs;
@@ -1947,8 +1947,8 @@
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)));
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)));
}
}
@@ -1995,8 +1995,8 @@
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)));
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)));
}
}
Modified: trunk/app/core/gimplayermask.c
==============================================================================
--- trunk/app/core/gimplayermask.c (original)
+++ trunk/app/core/gimplayermask.c Mon Nov 3 00:09:01 2008
@@ -243,8 +243,8 @@
gimp_drawable_update (drawable,
0, 0,
- gimp_item_width (GIMP_ITEM (drawable)),
- gimp_item_height (GIMP_ITEM (drawable)));
+ gimp_item_get_width (GIMP_ITEM (drawable)),
+ gimp_item_get_height (GIMP_ITEM (drawable)));
}
g_signal_emit (layer_mask, layer_mask_signals[APPLY_CHANGED], 0);
@@ -311,8 +311,8 @@
gimp_drawable_update (drawable,
0, 0,
- gimp_item_width (GIMP_ITEM (drawable)),
- gimp_item_height (GIMP_ITEM (drawable)));
+ gimp_item_get_width (GIMP_ITEM (drawable)),
+ gimp_item_get_height (GIMP_ITEM (drawable)));
}
g_signal_emit (layer_mask, layer_mask_signals[SHOW_CHANGED], 0);
Modified: trunk/app/core/gimpmaskundo.c
==============================================================================
--- trunk/app/core/gimpmaskundo.c (original)
+++ trunk/app/core/gimpmaskundo.c Mon Nov 3 00:09:01 2008
@@ -192,8 +192,8 @@
channel->empty = TRUE;
channel->x1 = 0;
channel->y1 = 0;
- channel->x2 = gimp_item_width (GIMP_ITEM (channel));
- channel->y2 = gimp_item_height (GIMP_ITEM (channel));
+ channel->x2 = gimp_item_get_width (GIMP_ITEM (channel));
+ channel->y2 = gimp_item_get_height (GIMP_ITEM (channel));
}
/* we know the bounds */
@@ -206,8 +206,8 @@
gimp_drawable_update (GIMP_DRAWABLE (channel),
0, 0,
- gimp_item_width (GIMP_ITEM (channel)),
- gimp_item_height (GIMP_ITEM (channel)));
+ gimp_item_get_width (GIMP_ITEM (channel)),
+ gimp_item_get_height (GIMP_ITEM (channel)));
}
static void
Modified: trunk/app/core/gimppalette-import.c
==============================================================================
--- trunk/app/core/gimppalette-import.c (original)
+++ trunk/app/core/gimppalette-import.c Mon Nov 3 00:09:01 2008
@@ -469,8 +469,8 @@
{
x = 0;
y = 0;
- width = gimp_item_width (GIMP_ITEM (drawable));
- height = gimp_item_height (GIMP_ITEM (drawable));
+ width = gimp_item_get_width (GIMP_ITEM (drawable));
+ height = gimp_item_get_height (GIMP_ITEM (drawable));
}
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
Modified: trunk/app/core/gimpprojection-construct.c
==============================================================================
--- trunk/app/core/gimpprojection-construct.c (original)
+++ trunk/app/core/gimpprojection-construct.c Mon Nov 3 00:09:01 2008
@@ -107,11 +107,11 @@
layer = GIMP_DRAWABLE (gimp_image_get_layer_by_index (image, 0));
- if (gimp_drawable_has_alpha (layer) &&
- (gimp_item_get_visible (GIMP_ITEM (layer))) &&
- (gimp_item_width (GIMP_ITEM (layer)) == image->width) &&
- (gimp_item_height (GIMP_ITEM (layer)) == image->height) &&
- (! gimp_drawable_is_indexed (layer)) &&
+ if (gimp_drawable_has_alpha (layer) &&
+ (gimp_item_get_visible (GIMP_ITEM (layer))) &&
+ (gimp_item_get_width (GIMP_ITEM (layer)) == image->width) &&
+ (gimp_item_get_height (GIMP_ITEM (layer)) == image->height) &&
+ (! gimp_drawable_is_indexed (layer)) &&
(gimp_layer_get_opacity (GIMP_LAYER (layer)) == GIMP_OPACITY_OPAQUE))
{
gint xoff;
@@ -243,8 +243,8 @@
x1 = CLAMP (off_x, x, x + w);
y1 = CLAMP (off_y, y, y + h);
- x2 = CLAMP (off_x + gimp_item_width (GIMP_ITEM (layer)), x, x + w);
- y2 = CLAMP (off_y + gimp_item_height (GIMP_ITEM (layer)), y, y + h);
+ x2 = CLAMP (off_x + gimp_item_get_width (GIMP_ITEM (layer)), x, x + w);
+ y2 = CLAMP (off_y + gimp_item_get_height (GIMP_ITEM (layer)), y, y + h);
/* configure the pixel regions */
pixel_region_init (&src1PR, gimp_projection_get_tiles (proj),
@@ -402,8 +402,8 @@
gimp_layer_get_opacity (GIMP_LAYER (item)) == GIMP_OPACITY_OPAQUE &&
(off_x <= x) &&
(off_y <= y) &&
- (off_x + gimp_item_width (item) >= x + w) &&
- (off_y + gimp_item_height (item) >= y + h))
+ (off_x + gimp_item_get_width (item) >= x + w) &&
+ (off_y + gimp_item_get_height (item) >= y + h))
{
coverage = TRUE;
break;
Modified: trunk/app/core/gimpselection.c
==============================================================================
--- trunk/app/core/gimpselection.c (original)
+++ trunk/app/core/gimpselection.c Mon Nov 3 00:09:01 2008
@@ -309,8 +309,8 @@
if (layer && gimp_layer_is_floating_sel (layer))
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
- gimp_item_width (GIMP_ITEM (layer)),
- gimp_item_height (GIMP_ITEM (layer)));
+ gimp_item_get_width (GIMP_ITEM (layer)),
+ gimp_item_get_height (GIMP_ITEM (layer)));
/* invalidate the preview */
drawable->preview_valid = FALSE;
@@ -380,9 +380,9 @@
x1 = CLAMP (off_x, 0, gimp_image_get_width (image));
y1 = CLAMP (off_y, 0, gimp_image_get_height (image));
- x2 = CLAMP (off_x + gimp_item_width (GIMP_ITEM (layer)),
+ x2 = CLAMP (off_x + gimp_item_get_width (GIMP_ITEM (layer)),
0, gimp_image_get_width (image));
- y2 = CLAMP (off_y + gimp_item_height (GIMP_ITEM (layer)),
+ y2 = CLAMP (off_y + gimp_item_get_height (GIMP_ITEM (layer)),
0, gimp_image_get_height (image));
return GIMP_CHANNEL_CLASS (parent_class)->boundary (channel,
@@ -567,8 +567,8 @@
src_item = GIMP_ITEM (channel);
dest_item = GIMP_ITEM (selection);
- g_return_if_fail (gimp_item_width (src_item) == gimp_item_width (dest_item));
- g_return_if_fail (gimp_item_height (src_item) == gimp_item_height (dest_item));
+ g_return_if_fail (gimp_item_get_width (src_item) == gimp_item_get_width (dest_item));
+ g_return_if_fail (gimp_item_get_height (src_item) == gimp_item_get_height (dest_item));
gimp_channel_push_undo (selection, _("Channel to Selection"));
@@ -576,14 +576,14 @@
pixel_region_init (&srcPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (channel)),
0, 0,
- gimp_item_width (src_item),
- gimp_item_height (src_item),
+ gimp_item_get_width (src_item),
+ gimp_item_get_height (src_item),
FALSE);
pixel_region_init (&destPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (selection)),
0, 0,
- gimp_item_width (dest_item),
- gimp_item_height (dest_item),
+ gimp_item_get_width (dest_item),
+ gimp_item_get_height (dest_item),
TRUE);
copy_region (&srcPR, &destPR);
@@ -591,8 +591,8 @@
gimp_drawable_update (GIMP_DRAWABLE (selection),
0, 0,
- gimp_item_width (dest_item),
- gimp_item_height (dest_item));
+ gimp_item_get_width (dest_item),
+ gimp_item_get_height (dest_item));
}
GimpChannel *
Modified: trunk/app/dialogs/offset-dialog.c
==============================================================================
--- trunk/app/dialogs/offset-dialog.c (original)
+++ trunk/app/dialogs/offset-dialog.c Mon Nov 3 00:09:01 2008
@@ -197,16 +197,16 @@
yres, FALSE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (dialog->off_se), 0,
- - gimp_item_width (item),
- gimp_item_width (item));
+ - gimp_item_get_width (item),
+ gimp_item_get_width (item));
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (dialog->off_se), 1,
- - gimp_item_height (item),
- gimp_item_height (item));
+ - gimp_item_get_height (item),
+ gimp_item_get_height (item));
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (dialog->off_se), 0,
- 0, gimp_item_width (item));
+ 0, gimp_item_get_width (item));
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (dialog->off_se), 1,
- 0, gimp_item_height (item));
+ 0, gimp_item_get_height (item));
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se), 0, 0);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se), 1, 0);
@@ -291,9 +291,9 @@
GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se),
- 0, gimp_item_width (item) / 2);
+ 0, gimp_item_get_width (item) / 2);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se),
- 1, gimp_item_height (item) / 2);
+ 1, gimp_item_get_height (item) / 2);
}
}
Modified: trunk/app/dialogs/resize-dialog.c
==============================================================================
--- trunk/app/dialogs/resize-dialog.c (original)
+++ trunk/app/dialogs/resize-dialog.c Mon Nov 3 00:09:01 2008
@@ -125,8 +125,8 @@
image = gimp_item_get_image (item);
- width = gimp_item_width (item);
- height = gimp_item_height (item);
+ width = gimp_item_get_width (item);
+ height = gimp_item_get_height (item);
text = _("Layer Size");
}
Modified: trunk/app/dialogs/scale-dialog.c
==============================================================================
--- trunk/app/dialogs/scale-dialog.c (original)
+++ trunk/app/dialogs/scale-dialog.c Mon Nov 3 00:09:01 2008
@@ -104,8 +104,8 @@
image = gimp_item_get_image (item);
- width = gimp_item_width (item);
- height = gimp_item_height (item);
+ width = gimp_item_get_width (item);
+ height = gimp_item_get_height (item);
text = _("Layer Size");
}
@@ -280,8 +280,8 @@
image = gimp_item_get_image (item);
- width = gimp_item_width (item);
- height = gimp_item_height (item);
+ width = gimp_item_get_width (item);
+ height = gimp_item_get_height (item);
}
else
{
Modified: trunk/app/display/gimpdisplayshell-dnd.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-dnd.c (original)
+++ trunk/app/display/gimpdisplayshell-dnd.c Mon Nov 3 00:09:01 2008
@@ -173,8 +173,8 @@
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;
+ off_x = x + (width - gimp_item_get_width (item)) / 2 - off_x;
+ off_y = y + (height - gimp_item_get_height (item)) / 2 - off_y;
gimp_item_translate (item, off_x, off_y, FALSE);
}
@@ -220,8 +220,8 @@
type = GIMP_IMAGE_TYPE_BASE_TYPE (gimp_drawable_type (drawable));
image = gimp_create_image (shell->display->gimp,
- gimp_item_width (GIMP_ITEM (viewable)),
- gimp_item_height (GIMP_ITEM (viewable)),
+ gimp_item_get_width (GIMP_ITEM (viewable)),
+ gimp_item_get_height (GIMP_ITEM (viewable)),
type, TRUE);
gimp_image_undo_disable (image);
Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c (original)
+++ trunk/app/display/gimpdisplayshell.c Mon Nov 3 00:09:01 2008
@@ -1638,15 +1638,15 @@
{
*x1 = off_x;
*y1 = off_y;
- *x2 = off_x + gimp_item_width (GIMP_ITEM (layer));
- *y2 = off_y + gimp_item_height (GIMP_ITEM (layer));
+ *x2 = off_x + gimp_item_get_width (GIMP_ITEM (layer));
+ *y2 = off_y + gimp_item_get_height (GIMP_ITEM (layer));
}
else
{
*x1 = MIN (off_x, *x1);
*y1 = MIN (off_y, *y1);
- *x2 = MAX (off_x + gimp_item_width (GIMP_ITEM (layer)), *x2);
- *y2 = MAX (off_y + gimp_item_height (GIMP_ITEM (layer)), *y2);
+ *x2 = MAX (off_x + gimp_item_get_width (GIMP_ITEM (layer)), *x2);
+ *y2 = MAX (off_y + gimp_item_get_height (GIMP_ITEM (layer)), *y2);
}
}
else if (! gimp_channel_bounds (gimp_image_get_mask (shell->display->image),
Modified: trunk/app/paint/gimpbrushcore.c
==============================================================================
--- trunk/app/paint/gimpbrushcore.c (original)
+++ trunk/app/paint/gimpbrushcore.c Mon Nov 3 00:09:01 2008
@@ -700,8 +700,8 @@
x = (gint) floor (paint_core->cur_coords.x) - (brush_width / 2);
y = (gint) floor (paint_core->cur_coords.y) - (brush_height / 2);
- drawable_width = gimp_item_width (GIMP_ITEM (drawable));
- drawable_height = gimp_item_height (GIMP_ITEM (drawable));
+ drawable_width = gimp_item_get_width (GIMP_ITEM (drawable));
+ drawable_height = gimp_item_get_height (GIMP_ITEM (drawable));
x1 = CLAMP (x - 1, 0, drawable_width);
y1 = CLAMP (y - 1, 0, drawable_height);
Modified: trunk/app/paint/gimpdodgeburn.c
==============================================================================
--- trunk/app/paint/gimpdodgeburn.c (original)
+++ trunk/app/paint/gimpdodgeburn.c Mon Nov 3 00:09:01 2008
@@ -193,10 +193,10 @@
GimpItem *item = GIMP_ITEM (drawable);
gint x1, y1, x2, y2;
- x1 = CLAMP (area->x, 0, gimp_item_width (item));
- y1 = CLAMP (area->y, 0, gimp_item_height (item));
- x2 = CLAMP (area->x + area->width, 0, gimp_item_width (item));
- y2 = CLAMP (area->y + area->height, 0, gimp_item_height (item));
+ x1 = CLAMP (area->x, 0, gimp_item_get_width (item));
+ y1 = CLAMP (area->y, 0, gimp_item_get_height (item));
+ x2 = CLAMP (area->x + area->width, 0, gimp_item_get_width (item));
+ y2 = CLAMP (area->y + area->height, 0, gimp_item_get_height (item));
if (!(x2 - x1) || !(y2 - y1))
return;
Modified: trunk/app/paint/gimpink.c
==============================================================================
--- trunk/app/paint/gimpink.c (original)
+++ trunk/app/paint/gimpink.c Mon Nov 3 00:09:01 2008
@@ -199,8 +199,8 @@
blob_bounds (ink->cur_blob, &x, &y, &width, &height);
- dwidth = gimp_item_width (GIMP_ITEM (drawable));
- dheight = gimp_item_height (GIMP_ITEM (drawable));
+ dwidth = gimp_item_get_width (GIMP_ITEM (drawable));
+ dheight = gimp_item_get_height (GIMP_ITEM (drawable));
x1 = CLAMP (x / SUBSAMPLE - 1, 0, dwidth);
y1 = CLAMP (y / SUBSAMPLE - 1, 0, dheight);
Modified: trunk/app/paint/gimppaintcore.c
==============================================================================
--- trunk/app/paint/gimppaintcore.c (original)
+++ trunk/app/paint/gimppaintcore.c Mon Nov 3 00:09:01 2008
@@ -357,8 +357,8 @@
if (core->undo_tiles)
tile_manager_unref (core->undo_tiles);
- core->undo_tiles = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ core->undo_tiles = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
gimp_drawable_bytes (drawable));
/* Allocate the saved proj structure */
@@ -382,8 +382,8 @@
if (core->canvas_tiles)
tile_manager_unref (core->canvas_tiles);
- core->canvas_tiles = tile_manager_new (gimp_item_width (item),
- gimp_item_height (item),
+ core->canvas_tiles = tile_manager_new (gimp_item_get_width (item),
+ gimp_item_get_height (item),
1);
/* Get the initial undo extents */
@@ -617,8 +617,8 @@
x1, y1,
(x2 - x1), (y2 - y1));
- drawable_width = gimp_item_width (GIMP_ITEM (drawable));
- drawable_height = gimp_item_height (GIMP_ITEM (drawable));
+ drawable_width = gimp_item_get_width (GIMP_ITEM (drawable));
+ drawable_height = gimp_item_get_height (GIMP_ITEM (drawable));
x1 = CLAMP (x1, 0, drawable_width);
y1 = CLAMP (y1, 0, drawable_height);
Modified: trunk/app/paint/gimpsmudge.c
==============================================================================
--- trunk/app/paint/gimpsmudge.c (original)
+++ trunk/app/paint/gimpsmudge.c Mon Nov 3 00:09:01 2008
@@ -187,10 +187,10 @@
gimp_pickable_get_pixel_at (GIMP_PICKABLE (drawable),
CLAMP ((gint) paint_core->cur_coords.x,
0,
- gimp_item_width (GIMP_ITEM (drawable)) - 1),
+ gimp_item_get_width (GIMP_ITEM (drawable)) - 1),
CLAMP ((gint) paint_core->cur_coords.y,
0,
- gimp_item_height (GIMP_ITEM (drawable)) - 1),
+ gimp_item_get_height (GIMP_ITEM (drawable)) - 1),
fill);
pixel_region_init_data (&srcPR, smudge->accum_data,
Modified: trunk/app/pdb/drawable-cmds.c
==============================================================================
--- trunk/app/pdb/drawable-cmds.c (original)
+++ trunk/app/pdb/drawable-cmds.c Mon Nov 3 00:09:01 2008
@@ -410,7 +410,7 @@
if (success)
{
- width = gimp_item_width (GIMP_ITEM (drawable));
+ width = gimp_item_get_width (GIMP_ITEM (drawable));
}
return_vals = gimp_procedure_get_return_values (procedure, success,
@@ -439,7 +439,7 @@
if (success)
{
- height = gimp_item_height (GIMP_ITEM (drawable));
+ height = gimp_item_get_height (GIMP_ITEM (drawable));
}
return_vals = gimp_procedure_get_return_values (procedure, success,
@@ -975,8 +975,8 @@
if (success)
{
- if (x_coord < gimp_item_width (GIMP_ITEM (drawable)) &&
- y_coord < gimp_item_height (GIMP_ITEM (drawable)))
+ if (x_coord < gimp_item_get_width (GIMP_ITEM (drawable)) &&
+ y_coord < gimp_item_get_height (GIMP_ITEM (drawable)))
{
Tile *tile;
guint8 *p;
@@ -1037,8 +1037,8 @@
if (success)
{
- if (x_coord < gimp_item_width (GIMP_ITEM (drawable)) &&
- y_coord < gimp_item_height (GIMP_ITEM (drawable)) &&
+ if (x_coord < gimp_item_get_width (GIMP_ITEM (drawable)) &&
+ y_coord < gimp_item_get_height (GIMP_ITEM (drawable)) &&
num_channels == gimp_drawable_bytes (drawable))
{
Tile *tile;
@@ -1156,8 +1156,8 @@
g_assert (GIMP_VIEWABLE_MAX_PREVIEW_SIZE >= 1024);
/* Adjust the width/height ratio */
- dwidth = gimp_item_width (GIMP_ITEM (drawable));
- dheight = gimp_item_height (GIMP_ITEM (drawable));
+ dwidth = gimp_item_get_width (GIMP_ITEM (drawable));
+ dheight = gimp_item_get_height (GIMP_ITEM (drawable));
if (dwidth > dheight)
height = MAX (1, (width * dheight) / dwidth);
@@ -1236,8 +1236,8 @@
if (success)
{
- if ((src_x + src_width) <= gimp_item_width (GIMP_ITEM (drawable)) &&
- (src_y + src_height) <= gimp_item_height (GIMP_ITEM (drawable)))
+ if ((src_x + src_width) <= gimp_item_get_width (GIMP_ITEM (drawable)) &&
+ (src_y + src_height) <= gimp_item_get_height (GIMP_ITEM (drawable)))
{
GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
TempBuf *buf;
Modified: trunk/app/text/gimptextlayer-xcf.c
==============================================================================
--- trunk/app/text/gimptextlayer-xcf.c (original)
+++ trunk/app/text/gimptextlayer-xcf.c Mon Nov 3 00:09:01 2008
@@ -202,8 +202,8 @@
item->parasites = GIMP_ITEM (layer)->parasites;
GIMP_ITEM (layer)->parasites = NULL;
- item->width = gimp_item_width (GIMP_ITEM (layer));
- item->height = gimp_item_height (GIMP_ITEM (layer));
+ item->width = gimp_item_get_width (GIMP_ITEM (layer));
+ item->height = gimp_item_get_height (GIMP_ITEM (layer));
gimp_item_get_offset (GIMP_ITEM (layer), &item->offset_x, &item->offset_y);
Modified: trunk/app/text/gimptextlayer.c
==============================================================================
--- trunk/app/text/gimptextlayer.c (original)
+++ trunk/app/text/gimptextlayer.c Mon Nov 3 00:09:01 2008
@@ -554,8 +554,8 @@
g_object_freeze_notify (G_OBJECT (drawable));
if (gimp_text_layout_get_size (layout, &width, &height) &&
- (width != gimp_item_width (item) ||
- height != gimp_item_height (item)))
+ (width != gimp_item_get_width (item) ||
+ height != gimp_item_get_height (item)))
{
TileManager *new_tiles = tile_manager_new (width, height,
drawable->bytes);
@@ -610,8 +610,8 @@
gimp_drawable_fill (drawable, &layer->text->color, NULL);
- width = gimp_item_width (item);
- height = gimp_item_height (item);
+ width = gimp_item_get_width (item);
+ height = gimp_item_get_height (item);
surface = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
Modified: trunk/app/tools/gimpaligntool.c
==============================================================================
--- trunk/app/tools/gimpaligntool.c (original)
+++ trunk/app/tools/gimpaligntool.c Mon Nov 3 00:09:01 2008
@@ -410,8 +410,8 @@
continue;
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));
+ x1 = x0 + gimp_item_get_width (GIMP_ITEM (layer));
+ y1 = y0 + gimp_item_get_height (GIMP_ITEM (layer));
if (x0 < X0 || y0 < Y0 || x1 > X1 || y1 > Y1)
continue;
@@ -681,8 +681,8 @@
{
gimp_item_get_offset (item, &x, &y);
- w = gimp_item_width (item);
- h = gimp_item_height (item);
+ w = gimp_item_get_width (item);
+ h = gimp_item_get_height (item);
}
gimp_draw_tool_draw_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
@@ -1132,8 +1132,8 @@
continue;
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));
+ width = gimp_item_get_width (GIMP_ITEM (layer));
+ height = gimp_item_get_height (GIMP_ITEM (layer));
if (off_x <= x &&
off_y <= y &&
Modified: trunk/app/tools/gimpeditselectiontool.c
==============================================================================
--- trunk/app/tools/gimpeditselectiontool.c (original)
+++ trunk/app/tools/gimpeditselectiontool.c Mon Nov 3 00:09:01 2008
@@ -349,8 +349,8 @@
case GIMP_TRANSLATE_MODE_FLOATING_SEL:
x1 = off_x;
y1 = off_y;
- x2 = x1 + gimp_item_width (active_item);
- y2 = y1 + gimp_item_height (active_item);
+ x2 = x1 + gimp_item_get_width (active_item);
+ y2 = y1 + gimp_item_get_height (active_item);
if (gimp_item_get_linked (active_item))
{
@@ -371,8 +371,8 @@
gimp_item_get_offset (item, &x3, &y3);
- x4 = x3 + gimp_item_width (item);
- y4 = y3 + gimp_item_height (item);
+ x4 = x3 + gimp_item_get_width (item);
+ y4 = y3 + gimp_item_get_height (item);
if (x3 < x1)
x1 = x3;
@@ -832,8 +832,8 @@
FALSE,
edit_select->cumlx + off_x,
edit_select->cumly + off_y,
- gimp_item_width (active_item),
- gimp_item_height (active_item),
+ gimp_item_get_width (active_item),
+ gimp_item_get_height (active_item),
FALSE);
}
}
@@ -859,8 +859,8 @@
gimp_item_get_offset (active_item, &x1, &y1);
- x2 = x1 + gimp_item_width (active_item);
- y2 = y1 + gimp_item_height (active_item);
+ x2 = x1 + gimp_item_get_width (active_item);
+ y2 = y1 + gimp_item_get_height (active_item);
if (gimp_item_get_linked (active_item))
{
@@ -882,8 +882,8 @@
gimp_item_get_offset (item, &x3, &y3);
- x4 = x3 + gimp_item_width (item);
- y4 = y3 + gimp_item_height (item);
+ x4 = x3 + gimp_item_get_width (item);
+ y4 = y3 + gimp_item_get_height (item);
if (x3 < x1)
x1 = x3;
Modified: trunk/app/tools/gimpforegroundselecttool.c
==============================================================================
--- trunk/app/tools/gimpforegroundselecttool.c (original)
+++ trunk/app/tools/gimpforegroundselecttool.c Mon Nov 3 00:09:01 2008
@@ -555,8 +555,8 @@
*x1 = MAX (*x1 - width / 2, 0);
*y1 = MAX (*y1 - height / 2, 0);
- *x2 = MIN (*x2 + width / 2, gimp_item_width (GIMP_ITEM (mask)));
- *y2 = MIN (*y2 + height / 2, gimp_item_height (GIMP_ITEM (mask)));
+ *x2 = MIN (*x2 + width / 2, gimp_item_get_width (GIMP_ITEM (mask)));
+ *y2 = MIN (*y2 + height / 2, gimp_item_get_height (GIMP_ITEM (mask)));
}
static void
Modified: trunk/app/tools/gimpimagemaptool.c
==============================================================================
--- trunk/app/tools/gimpimagemaptool.c (original)
+++ trunk/app/tools/gimpimagemaptool.c Mon Nov 3 00:09:01 2008
@@ -446,8 +446,8 @@
gimp_rectangle_intersect (x, y, w, h,
off_x,
off_y,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
&visible.x,
&visible.y,
&visible.width,
Modified: trunk/app/tools/gimprectangletool.c
==============================================================================
--- trunk/app/tools/gimprectangletool.c (original)
+++ trunk/app/tools/gimprectangletool.c Mon Nov 3 00:09:01 2008
@@ -626,8 +626,8 @@
}
else
{
- width = gimp_item_width (item);
- height = gimp_item_height (item);
+ width = gimp_item_get_width (item);
+ height = gimp_item_get_height (item);
}
}
break;
@@ -721,8 +721,8 @@
g_return_if_fail (display != NULL);
g_return_if_fail (display->image == item->image);
- width = gimp_item_width (item);
- height = gimp_item_height (item);
+ width = gimp_item_get_width (item);
+ height = gimp_item_get_height (item);
gimp_item_get_offset (item, &offset_x, &offset_y);
@@ -4103,8 +4103,8 @@
GimpItem *item = GIMP_ITEM (tool->drawable);
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);
+ *max_x = *min_x + gimp_item_get_width (item);
+ *max_y = *min_y + gimp_item_get_height (item);
}
break;
Modified: trunk/app/tools/gimpregionselecttool.c
==============================================================================
--- trunk/app/tools/gimpregionselecttool.c (original)
+++ trunk/app/tools/gimpregionselecttool.c Mon Nov 3 00:09:01 2008
@@ -377,14 +377,14 @@
pixel_region_init (&maskPR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (region_sel->region_mask)),
0, 0,
- gimp_item_width (GIMP_ITEM (region_sel->region_mask)),
- gimp_item_height (GIMP_ITEM (region_sel->region_mask)),
+ gimp_item_get_width (GIMP_ITEM (region_sel->region_mask)),
+ gimp_item_get_height (GIMP_ITEM (region_sel->region_mask)),
FALSE);
bsegs = boundary_find (&maskPR, BOUNDARY_WITHIN_BOUNDS,
0, 0,
- gimp_item_width (GIMP_ITEM (region_sel->region_mask)),
- gimp_item_height (GIMP_ITEM (region_sel->region_mask)),
+ gimp_item_get_width (GIMP_ITEM (region_sel->region_mask)),
+ gimp_item_get_height (GIMP_ITEM (region_sel->region_mask)),
BOUNDARY_HALF_WAY,
num_segs);
Modified: trunk/app/tools/gimptexttool.c
==============================================================================
--- trunk/app/tools/gimptexttool.c (original)
+++ trunk/app/tools/gimptexttool.c Mon Nov 3 00:09:01 2008
@@ -476,8 +476,8 @@
gdouble x = coords->x - item->offset_x;
gdouble y = coords->y - item->offset_y;
- if (x > 0 && x < gimp_item_width (item) &&
- y > 0 && y < gimp_item_height (item))
+ if (x > 0 && x < gimp_item_get_width (item) &&
+ y > 0 && y < gimp_item_get_height (item))
{
/* did the user click on a text layer? */
if (gimp_text_tool_set_drawable (text_tool, drawable, TRUE))
@@ -2417,7 +2417,7 @@
if (! text_tool->text || ! text_tool->image || ! text_tool->layer)
return;
- box_height = gimp_item_height (GIMP_ITEM (text_tool->layer));
+ box_height = gimp_item_get_height (GIMP_ITEM (text_tool->layer));
vectors0 = gimp_image_get_active_vectors (text_tool->image);
if (! vectors0)
Modified: trunk/app/vectors/gimpvectors.c
==============================================================================
--- trunk/app/vectors/gimpvectors.c (original)
+++ trunk/app/vectors/gimpvectors.c Mon Nov 3 00:09:01 2008
@@ -350,8 +350,8 @@
GimpStroke *stroke = list->data;
gimp_stroke_scale (stroke,
- (gdouble) new_width / (gdouble) gimp_item_width (item),
- (gdouble) new_height / (gdouble) gimp_item_height (item));
+ (gdouble) new_width / (gdouble) gimp_item_get_width (item),
+ (gdouble) new_height / (gdouble) gimp_item_get_height (item));
gimp_stroke_translate (stroke, new_offset_x, new_offset_y);
}
Modified: trunk/app/vectors/gimpvectorsmodundo.c
==============================================================================
--- trunk/app/vectors/gimpvectorsmodundo.c (original)
+++ trunk/app/vectors/gimpvectorsmodundo.c Mon Nov 3 00:09:01 2008
@@ -124,8 +124,8 @@
gimp_vectors_copy_strokes (temp, vectors);
- GIMP_ITEM (vectors)->width = gimp_item_width (GIMP_ITEM (temp));
- GIMP_ITEM (vectors)->height = gimp_item_height (GIMP_ITEM (temp));
+ GIMP_ITEM (vectors)->width = gimp_item_get_width (GIMP_ITEM (temp));
+ GIMP_ITEM (vectors)->height = gimp_item_get_height (GIMP_ITEM (temp));
GIMP_ITEM (vectors)->offset_x = GIMP_ITEM (temp)->offset_x;
GIMP_ITEM (vectors)->offset_y = GIMP_ITEM (temp)->offset_y;
Modified: trunk/app/widgets/gimptoolbox-dnd.c
==============================================================================
--- trunk/app/widgets/gimptoolbox-dnd.c (original)
+++ trunk/app/widgets/gimptoolbox-dnd.c Mon Nov 3 00:09:01 2008
@@ -189,8 +189,8 @@
if (context->gimp->busy)
return;
- width = gimp_item_width (item);
- height = gimp_item_height (item);
+ width = gimp_item_get_width (item);
+ height = gimp_item_get_height (item);
bytes = gimp_drawable_bytes (drawable);
type = GIMP_IMAGE_TYPE_BASE_TYPE (gimp_drawable_type (drawable));
Modified: trunk/app/widgets/gimpviewrendererdrawable.c
==============================================================================
--- trunk/app/widgets/gimpviewrendererdrawable.c (original)
+++ trunk/app/widgets/gimpviewrendererdrawable.c Mon Nov 3 00:09:01 2008
@@ -91,13 +91,13 @@
{
width = MAX (1, ROUND ((((gdouble) width /
(gdouble) gimp_image_get_width (image)) *
- (gdouble) gimp_item_width (item))));
+ (gdouble) gimp_item_get_width (item))));
height = MAX (1, ROUND ((((gdouble) height /
(gdouble) gimp_image_get_height (image)) *
- (gdouble) gimp_item_height (item))));
+ (gdouble) gimp_item_get_height (item))));
- gimp_viewable_calc_preview_size (gimp_item_width (item),
- gimp_item_height (item),
+ gimp_viewable_calc_preview_size (gimp_item_get_width (item),
+ gimp_item_get_height (item),
width,
height,
renderer->dot_for_dot,
@@ -109,8 +109,8 @@
}
else
{
- gimp_viewable_calc_preview_size (gimp_item_width (item),
- gimp_item_height (item),
+ gimp_viewable_calc_preview_size (gimp_item_get_width (item),
+ gimp_item_get_height (item),
width,
height,
renderer->dot_for_dot,
@@ -122,7 +122,7 @@
}
if ((view_width * view_height) <
- (gimp_item_width (item) * gimp_item_height (item) * 4))
+ (gimp_item_get_width (item) * gimp_item_get_height (item) * 4))
scaling_up = FALSE;
if (scaling_up)
@@ -133,8 +133,8 @@
gint src_width, src_height;
if (gimp_rectangle_intersect (0, 0,
- gimp_item_width (item),
- gimp_item_height (item),
+ gimp_item_get_width (item),
+ gimp_item_get_height (item),
-item->offset_x, -item->offset_y,
gimp_image_get_width (image),
gimp_image_get_height (image),
@@ -173,8 +173,8 @@
temp_buf = gimp_viewable_get_new_preview (renderer->viewable,
renderer->context,
- gimp_item_width (item),
- gimp_item_height (item));
+ gimp_item_get_width (item),
+ gimp_item_get_height (item));
if (temp_buf)
{
Modified: trunk/app/widgets/gimpviewrenderervectors.c
==============================================================================
--- trunk/app/widgets/gimpviewrenderervectors.c (original)
+++ trunk/app/widgets/gimpviewrenderervectors.c Mon Nov 3 00:09:01 2008
@@ -93,9 +93,9 @@
gdouble yscale;
xscale = ((gdouble) renderer->width /
- (gdouble) gimp_item_width (GIMP_ITEM (vectors)));
+ (gdouble) gimp_item_get_width (GIMP_ITEM (vectors)));
yscale = ((gdouble) renderer->height /
- (gdouble) gimp_item_height (GIMP_ITEM (vectors)));
+ (gdouble) gimp_item_get_height (GIMP_ITEM (vectors)));
cairo_scale (cr, xscale, yscale);
Modified: trunk/app/xcf/xcf-load.c
==============================================================================
--- trunk/app/xcf/xcf-load.c (original)
+++ trunk/app/xcf/xcf-load.c Mon Nov 3 00:09:01 2008
@@ -795,8 +795,8 @@
mask = image->selection_mask =
gimp_selection_new (image,
- gimp_item_width (GIMP_ITEM (*channel)),
- gimp_item_height (GIMP_ITEM (*channel)));
+ gimp_item_get_width (GIMP_ITEM (*channel)),
+ gimp_item_get_height (GIMP_ITEM (*channel)));
g_object_ref_sink (mask);
tile_manager_unref (GIMP_DRAWABLE (mask)->tiles);
Modified: trunk/app/xcf/xcf-save.c
==============================================================================
--- trunk/app/xcf/xcf-save.c (original)
+++ trunk/app/xcf/xcf-save.c Mon Nov 3 00:09:01 2008
@@ -1100,10 +1100,10 @@
}
/* write out the width, height and image type information for the layer */
- value = gimp_item_width (GIMP_ITEM (layer));
+ value = gimp_item_get_width (GIMP_ITEM (layer));
xcf_write_int32_check_error (info, &value, 1);
- value = gimp_item_height (GIMP_ITEM (layer));
+ value = gimp_item_get_height (GIMP_ITEM (layer));
xcf_write_int32_check_error (info, &value, 1);
value = gimp_drawable_type (GIMP_DRAWABLE (layer));
@@ -1177,10 +1177,10 @@
}
/* write out the width and height information for the channel */
- value = gimp_item_width (GIMP_ITEM (channel));
+ value = gimp_item_get_width (GIMP_ITEM (channel));
xcf_write_int32_check_error (info, &value, 1);
- value = gimp_item_height (GIMP_ITEM (channel));
+ value = gimp_item_get_height (GIMP_ITEM (channel));
xcf_write_int32_check_error (info, &value, 1);
/* write out the channels name */
Modified: trunk/tools/pdbgen/pdb/drawable.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/drawable.pdb (original)
+++ trunk/tools/pdbgen/pdb/drawable.pdb Mon Nov 3 00:09:01 2008
@@ -539,7 +539,7 @@
%invoke = (
code => <<'CODE'
{
- width = gimp_item_width (GIMP_ITEM (drawable));
+ width = gimp_item_get_width (GIMP_ITEM (drawable));
}
CODE
);
@@ -564,7 +564,7 @@
%invoke = (
code => <<'CODE'
{
- height = gimp_item_height (GIMP_ITEM (drawable));
+ height = gimp_item_get_height (GIMP_ITEM (drawable));
}
CODE
);
@@ -951,8 +951,8 @@
%invoke = (
code => <<'CODE'
{
- if (x_coord < gimp_item_width (GIMP_ITEM (drawable)) &&
- y_coord < gimp_item_height (GIMP_ITEM (drawable)))
+ if (x_coord < gimp_item_get_width (GIMP_ITEM (drawable)) &&
+ y_coord < gimp_item_get_height (GIMP_ITEM (drawable)))
{
Tile *tile;
guint8 *p;
@@ -1010,8 +1010,8 @@
%invoke = (
code => <<'CODE'
{
- if (x_coord < gimp_item_width (GIMP_ITEM (drawable)) &&
- y_coord < gimp_item_height (GIMP_ITEM (drawable)) &&
+ if (x_coord < gimp_item_get_width (GIMP_ITEM (drawable)) &&
+ y_coord < gimp_item_get_height (GIMP_ITEM (drawable)) &&
num_channels == gimp_drawable_bytes (drawable))
{
Tile *tile;
@@ -1102,8 +1102,8 @@
g_assert (GIMP_VIEWABLE_MAX_PREVIEW_SIZE >= 1024);
/* Adjust the width/height ratio */
- dwidth = gimp_item_width (GIMP_ITEM (drawable));
- dheight = gimp_item_height (GIMP_ITEM (drawable));
+ dwidth = gimp_item_get_width (GIMP_ITEM (drawable));
+ dheight = gimp_item_get_height (GIMP_ITEM (drawable));
if (dwidth > dheight)
height = MAX (1, (width * dheight) / dwidth);
@@ -1183,8 +1183,8 @@
headers => [ qw("core/gimpdrawable-preview.h") ],
code => <<'CODE'
{
- if ((src_x + src_width) <= gimp_item_width (GIMP_ITEM (drawable)) &&
- (src_y + src_height) <= gimp_item_height (GIMP_ITEM (drawable)))
+ if ((src_x + src_width) <= gimp_item_get_width (GIMP_ITEM (drawable)) &&
+ (src_y + src_height) <= gimp_item_get_height (GIMP_ITEM (drawable)))
{
GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
TempBuf *buf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
