Commit 6efd812d authored by Øyvind "pippin" Kolås's avatar Øyvind "pippin" Kolås Committed by Michael Natterer
Browse files

app: s/GIMP_GEGL_RECT/GEGL_RECTANGLE/

Defining GeglRectangle inline is so useful that it has been added to
GEGL.
parent aebf55d7
......@@ -59,7 +59,7 @@ gimp_apply_operation (GeglBuffer *src_buffer,
}
else
{
rect = *GIMP_GEGL_RECT (0, 0, gegl_buffer_get_width (dest_buffer),
rect = *GEGL_RECTANGLE (0, 0, gegl_buffer_get_width (dest_buffer),
gegl_buffer_get_height (dest_buffer));
}
......
......@@ -480,7 +480,7 @@ gimp_edit_fill_full (GimpImage *image,
}
}
dest_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, width, height),
dest_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
format);
if (pattern)
......@@ -499,7 +499,7 @@ gimp_edit_fill_full (GimpImage *image,
}
gimp_drawable_apply_buffer (drawable, dest_buffer,
GIMP_GEGL_RECT (0, 0, width, height),
GEGL_RECTANGLE (0, 0, width, height),
TRUE, undo_desc,
opacity, paint_mode,
NULL, x, y,
......@@ -536,7 +536,7 @@ gimp_edit_fade (GimpImage *image,
gimp_image_undo (image);
gimp_drawable_apply_buffer (drawable, buffer,
GIMP_GEGL_RECT (0, 0,
GEGL_RECTANGLE (0, 0,
gegl_buffer_get_width (undo->buffer),
gegl_buffer_get_height (undo->buffer)),
TRUE,
......
......@@ -57,7 +57,7 @@ gimp_channel_combine_rect (GimpChannel *mask,
color = gegl_color_new ("#000");
gegl_buffer_set_color (gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)),
GIMP_GEGL_RECT (x, y, w, h), color);
GEGL_RECTANGLE (x, y, w, h), color);
g_object_unref (color);
/* Determine new boundary */
......@@ -237,7 +237,7 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
iter = gegl_buffer_iterator_new (buffer,
GIMP_GEGL_RECT (x0, y0, width, height), 0,
GEGL_RECTANGLE (x0, y0, width, height), 0,
babl_format ("Y u8"), GEGL_BUFFER_READWRITE,
GEGL_ABYSS_NONE);
roi = &iter->roi[0];
......
......@@ -459,7 +459,7 @@ gimp_channel_convert (GimpItem *item,
format = gimp_drawable_get_format_without_alpha (drawable);
new_buffer =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
gimp_item_get_width (item),
gimp_item_get_height (item)),
format);
......@@ -538,9 +538,9 @@ gimp_channel_translate (GimpItem *item,
tmp_buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (tmp_mask));
gegl_buffer_copy (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GIMP_GEGL_RECT (x1 - off_x, y1 - off_y, width, height),
GEGL_RECTANGLE (x1 - off_x, y1 - off_y, width, height),
tmp_buffer,
GIMP_GEGL_RECT (0,0,0,0));
GEGL_RECTANGLE (0,0,0,0));
}
/* clear the mask */
......@@ -554,7 +554,7 @@ gimp_channel_translate (GimpItem *item,
gegl_buffer_copy (tmp_buffer,
NULL,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GIMP_GEGL_RECT (x1, y1, 0, 0));
GEGL_RECTANGLE (x1, y1, 0, 0));
/* free the temporary mask */
g_object_unref (tmp_mask);
......@@ -608,7 +608,7 @@ gimp_channel_scale (GimpItem *item,
GeglBuffer *new_buffer;
new_buffer =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, new_width, new_height),
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, new_width, new_height),
gimp_drawable_get_format (drawable));
gimp_drawable_set_buffer_full (drawable,
......@@ -1308,7 +1308,7 @@ gimp_channel_real_clear (GimpChannel *channel,
if (channel->bounds_known && ! channel->empty)
{
gegl_buffer_clear (gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GIMP_GEGL_RECT (channel->x1, channel->y1,
GEGL_RECTANGLE (channel->x1, channel->y1,
channel->x2 - channel->x1,
channel->y2 - channel->y1));
}
......@@ -1456,7 +1456,7 @@ gimp_channel_real_border (GimpChannel *channel,
NULL, NULL,
border,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GIMP_GEGL_RECT (x1, y1, x2 - x1, y2 - y1));
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
g_object_unref (border);
......@@ -1530,7 +1530,7 @@ gimp_channel_real_grow (GimpChannel *channel,
NULL, NULL,
grow,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GIMP_GEGL_RECT (x1, y1, x2 - x1, y2 - y1));
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
g_object_unref (grow);
......@@ -1595,7 +1595,7 @@ gimp_channel_real_shrink (GimpChannel *channel,
NULL, NULL,
shrink,
gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)),
GIMP_GEGL_RECT (x1, y1, x2 - x1, y2 - y1));
GEGL_RECTANGLE (x1, y1, x2 - x1, y2 - y1));
g_object_unref (shrink);
......
......@@ -206,7 +206,7 @@ gimp_drawable_blend (GimpDrawable *drawable,
gimp_set_busy (image->gimp);
/* Always create an alpha temp buf (for generality) */
buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, width, height),
buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
gimp_drawable_get_format_with_alpha (drawable));
pixel_region_init (&bufPR, gimp_gegl_buffer_get_tiles (buffer),
......@@ -223,7 +223,7 @@ gimp_drawable_blend (GimpDrawable *drawable,
gimp_gegl_buffer_refetch_tiles (buffer);
gimp_drawable_apply_buffer (drawable, buffer,
GIMP_GEGL_RECT (0, 0, width, height),
GEGL_RECTANGLE (0, 0, width, height),
TRUE, C_("undo-type", "Blend"),
opacity, paint_mode,
NULL, x, y,
......@@ -494,7 +494,7 @@ gradient_calc_shapeburst_angular_factor (GeglBuffer *dist_buffer,
gint iy = CLAMP (y, 0.0, gegl_buffer_get_height (dist_buffer) - 0.7);
gfloat value;
gegl_buffer_get (dist_buffer, GIMP_GEGL_RECT (ix, iy, 1, 1), 1.0,
gegl_buffer_get (dist_buffer, GEGL_RECTANGLE (ix, iy, 1, 1), 1.0,
NULL, &value,
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
......@@ -513,7 +513,7 @@ gradient_calc_shapeburst_spherical_factor (GeglBuffer *dist_buffer,
gint iy = CLAMP (y, 0.0, gegl_buffer_get_height (dist_buffer) - 0.7);
gfloat value;
gegl_buffer_get (dist_buffer, GIMP_GEGL_RECT (ix, iy, 1, 1), 1.0,
gegl_buffer_get (dist_buffer, GEGL_RECTANGLE (ix, iy, 1, 1), 1.0,
NULL, &value,
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
......@@ -532,7 +532,7 @@ gradient_calc_shapeburst_dimpled_factor (GeglBuffer *dist_buffer,
gint iy = CLAMP (y, 0.0, gegl_buffer_get_height (dist_buffer) - 0.7);
gfloat value;
gegl_buffer_get (dist_buffer, GIMP_GEGL_RECT (ix, iy, 1, 1), 1.0,
gegl_buffer_get (dist_buffer, GEGL_RECTANGLE (ix, iy, 1, 1), 1.0,
NULL, &value,
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
......@@ -558,11 +558,11 @@ gradient_precalc_shapeburst (GimpImage *image,
gimp_progress_set_text (progress, _("Calculating distance map"));
/* allocate the distance map */
dist_buffer = gegl_buffer_new (GIMP_GEGL_RECT (0, 0, PR->w, PR->h),
dist_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, PR->w, PR->h),
babl_format ("Y float"));
/* allocate the selection mask copy */
temp_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, PR->w, PR->h),
temp_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, PR->w, PR->h),
babl_format ("Y u8"));
mask = gimp_image_get_mask (image);
......@@ -578,9 +578,9 @@ gradient_precalc_shapeburst (GimpImage *image,
/* copy the mask to the temp mask */
gegl_buffer_copy (gimp_drawable_get_buffer (GIMP_DRAWABLE (mask)),
GIMP_GEGL_RECT (x+off_x, y + off_y, width, height),
GEGL_RECTANGLE (x+off_x, y + off_y, width, height),
temp_buffer,
GIMP_GEGL_RECT (0,0,0,0));
GEGL_RECTANGLE (0,0,0,0));
}
else
{
......@@ -590,9 +590,9 @@ gradient_precalc_shapeburst (GimpImage *image,
/* extract the aplha into the temp mask */
gegl_buffer_set_format (temp_buffer, babl_format ("A u8"));
gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
GIMP_GEGL_RECT (PR->x, PR->y, PR->w, PR->h),
GEGL_RECTANGLE (PR->x, PR->y, PR->w, PR->h),
temp_buffer,
GIMP_GEGL_RECT (0, 0, 0, 0));
GEGL_RECTANGLE (0, 0, 0, 0));
gegl_buffer_set_format (temp_buffer, NULL);
}
else
......
......@@ -220,7 +220,7 @@ gimp_drawable_bucket_fill_internal (GimpDrawable *drawable,
mask_offset_y = y1;
}
buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, x2 - x1, y2 - y1),
buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, x2 - x1, y2 - y1),
gimp_drawable_get_format_with_alpha (drawable));
switch (fill_mode)
......@@ -259,7 +259,7 @@ gimp_drawable_bucket_fill_internal (GimpDrawable *drawable,
/* Apply it to the image */
gimp_drawable_apply_buffer (drawable, buffer,
GIMP_GEGL_RECT (0, 0, x2 - x1, y2 - y1),
GEGL_RECTANGLE (0, 0, x2 - x1, y2 - y1),
TRUE, C_("undo-type", "Bucket Fill"),
opacity, paint_mode,
NULL, x1, y1,
......
......@@ -140,15 +140,15 @@ gimp_drawable_real_apply_buffer (GimpDrawable *drawable,
undo->opacity = opacity;
undo->applied_buffer =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, width, height),
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
gegl_buffer_get_format (buffer));
gegl_buffer_copy (buffer,
GIMP_GEGL_RECT (buffer_region->x + (x - base_x),
GEGL_RECTANGLE (buffer_region->x + (x - base_x),
buffer_region->y + (y - base_y),
width, height),
undo->applied_buffer,
GIMP_GEGL_RECT (0, 0, width, height));
GEGL_RECTANGLE (0, 0, width, height));
}
}
......
......@@ -51,7 +51,7 @@ gimp_drawable_convert_rgb (GimpDrawable *drawable,
type = GIMP_IMAGE_TYPE_WITH_ALPHA (type);
dest_buffer =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
gimp_item_get_width (GIMP_ITEM (drawable)),
gimp_item_get_height (GIMP_ITEM (drawable))),
gimp_image_get_format (dest_image, type));
......@@ -81,7 +81,7 @@ gimp_drawable_convert_grayscale (GimpDrawable *drawable,
type = GIMP_IMAGE_TYPE_WITH_ALPHA (type);
dest_buffer =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
gimp_item_get_width (GIMP_ITEM (drawable)),
gimp_item_get_height (GIMP_ITEM (drawable))),
gimp_image_get_format (dest_image, type));
......@@ -111,7 +111,7 @@ gimp_drawable_convert_indexed (GimpDrawable *drawable,
format = gimp_image_colormap_get_rgb_format (dest_image);
dest_buffer =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
gimp_item_get_width (GIMP_ITEM (drawable)),
gimp_item_get_height (GIMP_ITEM (drawable))),
format);
......
......@@ -85,7 +85,7 @@ gimp_drawable_offset (GimpDrawable *drawable,
src_buffer = gimp_drawable_get_buffer (drawable);
new_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, width, height),
new_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
gimp_drawable_get_format (drawable));
if (! wrap_around)
......@@ -137,9 +137,9 @@ gimp_drawable_offset (GimpDrawable *drawable,
if (width && height)
{
gegl_buffer_copy (src_buffer,
GIMP_GEGL_RECT (src_x, src_y, width, height),
GEGL_RECTANGLE (src_x, src_y, width, height),
new_buffer,
GIMP_GEGL_RECT (dest_x,dest_y, width, height));
GEGL_RECTANGLE (dest_x,dest_y, width, height));
}
if (wrap_around)
......@@ -179,10 +179,10 @@ gimp_drawable_offset (GimpDrawable *drawable,
if (offset_x != 0 && offset_y != 0)
{
gegl_buffer_copy (src_buffer,
GIMP_GEGL_RECT (src_x, src_y,
GEGL_RECTANGLE (src_x, src_y,
ABS (offset_x), ABS (offset_y)),
new_buffer,
GIMP_GEGL_RECT (dest_x, dest_y, 0, 0));
GEGL_RECTANGLE (dest_x, dest_y, 0, 0));
}
/* X offset */
......
......@@ -62,7 +62,7 @@ gimp_drawable_get_shadow_buffer (GimpDrawable *drawable)
}
drawable->private->shadow =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, width, height), format);
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height), format);
return drawable->private->shadow;
}
......@@ -100,7 +100,7 @@ gimp_drawable_merge_shadow_buffer (GimpDrawable *drawable,
GeglBuffer *buffer = g_object_ref (drawable->private->shadow);
gimp_drawable_apply_buffer (drawable, buffer,
GIMP_GEGL_RECT (x, y, width, height),
GEGL_RECTANGLE (x, y, width, height),
push_undo, undo_desc,
GIMP_OPACITY_OPAQUE, GIMP_REPLACE_MODE,
NULL, x, y,
......
......@@ -338,7 +338,7 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
/* fill a 1-bpp GeglBuffer with black, this will describe the shape
* of the stroke.
*/
mask_buffer = gegl_buffer_new (GIMP_GEGL_RECT (0, 0, w, h),
mask_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, w, h),
babl_format ("Y u8"));
gegl_buffer_clear (mask_buffer, NULL);
......@@ -350,7 +350,7 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
x + off_x, y + off_y,
gimp_fill_options_get_antialias (options));
base_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, w, h),
base_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, w, h),
gimp_drawable_get_format_with_alpha (drawable));
switch (gimp_fill_options_get_style (options))
......@@ -392,7 +392,7 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
/* Apply to drawable */
gimp_drawable_apply_buffer (drawable, base_buffer,
GIMP_GEGL_RECT (0, 0, w, h),
GEGL_RECTANGLE (0, 0, w, h),
push_undo, C_("undo-type", "Render Stroke"),
gimp_context_get_opacity (context),
gimp_context_get_paint_mode (context),
......
......@@ -127,7 +127,7 @@ gimp_drawable_transform_buffer_affine (GimpDrawable *drawable,
&x1, &y1, &x2, &y2);
/* Get the new temporary buffer for the transformed result */
new_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, x2 - x1, y2 - y1),
new_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, x2 - x1, y2 - y1),
gegl_buffer_get_format (orig_buffer));
gimp_matrix3_identity (&gegl_matrix);
......@@ -208,7 +208,7 @@ gimp_drawable_transform_buffer_flip (GimpDrawable *drawable,
break;
}
new_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
new_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
new_width, new_height),
gegl_buffer_get_format (orig_buffer));
......@@ -419,7 +419,7 @@ gimp_drawable_transform_buffer_rotate (GimpDrawable *drawable,
gint clip_x, clip_y;
gint clip_width, clip_height;
new_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
new_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
orig_width, orig_height),
gegl_buffer_get_format (orig_buffer));
......@@ -496,7 +496,7 @@ gimp_drawable_transform_buffer_rotate (GimpDrawable *drawable,
}
else
{
new_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
new_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
new_width, new_height),
gegl_buffer_get_format (orig_buffer));
......
......@@ -430,7 +430,7 @@ gimp_drawable_scale (GimpItem *item,
GeglBuffer *new_buffer;
GeglNode *scale;
new_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
new_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
new_width, new_height),
gimp_drawable_get_format (drawable));
......@@ -498,7 +498,7 @@ gimp_drawable_resize (GimpItem *item,
&copy_width,
&copy_height);
new_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
new_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
new_width, new_height),
gimp_drawable_get_format (drawable));
......@@ -525,12 +525,12 @@ gimp_drawable_resize (GimpItem *item,
{
/* Copy the pixels in the intersection */
gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
GIMP_GEGL_RECT (copy_x - gimp_item_get_offset_x (item),
GEGL_RECTANGLE (copy_x - gimp_item_get_offset_x (item),
copy_y - gimp_item_get_offset_y (item),
copy_width,
copy_height),
new_buffer,
GIMP_GEGL_RECT (copy_x - new_offset_x,
GEGL_RECTANGLE (copy_x - new_offset_x,
copy_y - new_offset_y, 0, 0));
}
......@@ -673,7 +673,7 @@ gimp_drawable_real_update (GimpDrawable *drawable,
if (operation)
{
gegl_operation_invalidate (GEGL_OPERATION (operation),
GIMP_GEGL_RECT (x,y,width,height), FALSE);
GEGL_RECTANGLE (x,y,width,height), FALSE);
g_object_unref (operation);
}
}
......@@ -812,13 +812,13 @@ gimp_drawable_real_push_undo (GimpDrawable *drawable,
{
if (! buffer)
{
buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, width, height),
buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
gimp_drawable_get_format (drawable));
gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
GIMP_GEGL_RECT (x, y, width, height),
GEGL_RECTANGLE (x, y, width, height),
buffer,
GIMP_GEGL_RECT (0, 0, 0, 0));
GEGL_RECTANGLE (0, 0, 0, 0));
}
else
{
......@@ -845,13 +845,13 @@ gimp_drawable_real_swap_pixels (GimpDrawable *drawable,
tmp = gimp_gegl_buffer_dup (buffer);
gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
GIMP_GEGL_RECT (x, y, width, height),
GEGL_RECTANGLE (x, y, width, height),
buffer,
GIMP_GEGL_RECT (0, 0, 0, 0));
GEGL_RECTANGLE (0, 0, 0, 0));
gegl_buffer_copy (tmp,
GIMP_GEGL_RECT (0, 0, width, height),
GEGL_RECTANGLE (0, 0, width, height),
gimp_drawable_get_buffer (drawable),
GIMP_GEGL_RECT (x, y, 0, 0));
GEGL_RECTANGLE (x, y, 0, 0));
g_object_unref (tmp);
......@@ -1081,7 +1081,7 @@ gimp_drawable_new (GType type,
offset_x, offset_y,
width, height));
drawable->private->buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
drawable->private->buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
width, height),
format);
......@@ -1292,14 +1292,14 @@ gimp_drawable_init_src_region (GimpDrawable *drawable,
/* a temporary buffer for the compisition of the drawable and
* its floating selection
*/
*temp_buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
*temp_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
width, height),
gimp_drawable_get_format (drawable));
gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
GIMP_GEGL_RECT (x, y, width, height),
GEGL_RECTANGLE (x, y, width, height),
*temp_buffer,
GIMP_GEGL_RECT (0, 0, 0, 0));
GEGL_RECTANGLE (0, 0, 0, 0));
/* then, apply the floating selection onto the buffer just as
* we apply it onto the drawable when anchoring the floating
......@@ -1314,7 +1314,7 @@ gimp_drawable_init_src_region (GimpDrawable *drawable,
gimp_drawable_apply_buffer (drawable,
gimp_drawable_get_buffer (GIMP_DRAWABLE (fs)),
GIMP_GEGL_RECT (combine_x - fs_off_x,
GEGL_RECTANGLE (combine_x - fs_off_x,
combine_y - fs_off_y,
combine_width,
combine_height),
......
......@@ -1011,7 +1011,7 @@ gimp_image_convert (GimpImage *image,
babl_format_has_alpha (new_format));
new_buffer =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
gimp_item_get_width (GIMP_ITEM (layer)),
gimp_item_get_height (GIMP_ITEM (layer))),
new_format);
......@@ -3735,7 +3735,7 @@ median_cut_pass2_fs_dither_gray (QuantizeObj *quantobj,
const guchar *src;
guchar *dest;
gegl_buffer_get (src_buffer, GIMP_GEGL_RECT (0, row, width, 1),
gegl_buffer_get (src_buffer, GEGL_RECTANGLE (0, row, width, 1),
1.0, NULL, src_buf,
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
......@@ -3875,7 +3875,7 @@ median_cut_pass2_fs_dither_gray (QuantizeObj *quantobj,
odd_row = !odd_row;
gegl_buffer_set (new_buffer, GIMP_GEGL_RECT (0, row, width, 1),
gegl_buffer_set (new_buffer, GEGL_RECTANGLE (0, row, width, 1),
0, NULL, dest_buf,
GEGL_AUTO_ROWSTRIDE);
}
......@@ -4023,7 +4023,7 @@ median_cut_pass2_fs_dither_rgb (QuantizeObj *quantobj,
const guchar *src;
guchar *dest;
gegl_buffer_get (src_buffer, GIMP_GEGL_RECT (0, row, width, 1),
gegl_buffer_get (src_buffer, GEGL_RECTANGLE (0, row, width, 1),
1.0, NULL, src_buf,
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
......@@ -4272,7 +4272,7 @@ median_cut_pass2_fs_dither_rgb (QuantizeObj *quantobj,
odd_row = !odd_row;
gegl_buffer_set (new_buffer, GIMP_GEGL_RECT (0, row, width, 1),
gegl_buffer_set (new_buffer, GEGL_RECTANGLE (0, row, width, 1),
0, NULL, dest_buf,
GEGL_AUTO_ROWSTRIDE);
......
......@@ -543,7 +543,7 @@ gimp_image_merge_layers (GimpImage *image,
color = gimp_gegl_color_new (&bg);
gegl_buffer_set_color (gimp_drawable_get_buffer (GIMP_DRAWABLE (merge_layer)),
GIMP_GEGL_RECT(0,0,x2-x1,y2-y1), color);
GEGL_RECTANGLE(0,0,x2-x1,y2-y1), color);
g_object_unref (color);
position = 0;
......
......@@ -530,9 +530,9 @@ gimp_image_map_clear (GimpImageMap *image_map)
gint height = gegl_buffer_get_height (image_map->undo_buffer);
gegl_buffer_copy (image_map->undo_buffer,
GIMP_GEGL_RECT (0, 0, width, height),
GEGL_RECTANGLE (0, 0, width, height),
gimp_drawable_get_buffer (image_map->drawable),
GIMP_GEGL_RECT (x, y, width, height));
GEGL_RECTANGLE (x, y, width, height));
gimp_drawable_update (image_map->drawable, x, y, width, height);
}
......@@ -601,7 +601,7 @@ gimp_image_map_update_undo_buffer (GimpImageMap *image_map,
/* Allocate new tiles */
image_map->undo_buffer =
gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0,
gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0,
rect->width, rect->height),
gimp_drawable_get_format (image_map->drawable));
}
......@@ -610,7 +610,7 @@ gimp_image_map_update_undo_buffer (GimpImageMap *image_map,
gegl_buffer_copy (gimp_drawable_get_buffer (image_map->drawable),
rect,
image_map->undo_buffer,
GIMP_GEGL_RECT (0, 0, 0, 0));
GEGL_RECTANGLE (0, 0, 0, 0));
/* Set the offsets */
image_map->undo_offset_x = rect->x;
......@@ -680,17 +680,17 @@ gimp_image_map_data_written (GObject *operation,
/* Reset to initial drawable conditions. */
gegl_buffer_copy (image_map->undo_buffer,
GIMP_GEGL_RECT (extent->x - image_map->undo_offset_x,
GEGL_RECTANGLE (extent->x - image_map->undo_offset_x,
extent->y - image_map->undo_offset_y,
extent->width, extent->height),
gimp_drawable_get_buffer (image_map->drawable),
GIMP_GEGL_RECT (extent->x, extent->y, 0, 0));
GEGL_RECTANGLE (extent->x, extent->y, 0, 0));
}
/* Apply the result of the gegl graph. */
gimp_drawable_apply_buffer (image_map->drawable,
gimp_drawable_get_shadow_buffer (image_map->drawable),
GIMP_GEGL_RECT (extent->x, extent->y,
GEGL_RECT