Commit b48f334a authored by Øyvind Kolås's avatar Øyvind Kolås

%s/->w/->width/ , %s/\.w/.width/ for GeglRectangles.

* bin/editor.c: (cb_introspect), (cb_fit), (cb_fit_on_screen),
(cb_shrinkwrap):
* bin/export.c: (set_to_defined), (button_input_clicked),
(button_view_clicked), (button_render_clicked),
(gegl_buffer_export_png):
* bin/gegl-view.c: (computed_event), (expose_event):
* bin/gegl.c:
* gegl/buffer/gegl-buffer.c: (gegl_buffer_constructor),
(gegl_buffer_void), (gegl_buffer_set), (gegl_buffer_get_scaled),
(gegl_buffer_get):
* gegl/buffer/gegl-buffer.h:
* gegl/buffer/gegl-region-generic.c: (gegl_region_rectangle),
(gegl_region_get_clipbox), (gegl_region_get_rectangles),
(gegl_region_union_with_rect), (gegl_region_rect_in):
* gegl/gegl-debug-rect-visitor.c: (visit_node):
* gegl/gegl-eval-mgr.c: (gegl_eval_mgr_apply):
* gegl/gegl-graph.c: (source_invalidated):
* gegl/gegl-have-visitor.c: (visit_node):
* gegl/gegl-node-dynamic.c: (gegl_node_dynamic_set_need_rect),
(gegl_node_dynamic_set_result_rect):
* gegl/gegl-node.c: (source_invalidated), (gegl_node_blit),
(gegl_node_set_have_rect), (gegl_node_set_need_rect),
(gegl_node_set_result_rect), (gegl_node_process):
* gegl/gegl-operation-point-composer.c: (process_inner):
* gegl/gegl-operation-point-filter.c: (process_inner):
* gegl/gegl-operation.c: (gegl_operation_get_affected_region),
(gegl_operation_set_source_region), (gegl_operation_detect):
* gegl/gegl-processor.c: (gegl_node_new_processor),
(render_rectangle), (rect_area):
* gegl/gegl-types.h:
* gegl/gegl-utils.c: (gegl_rectangle_set),
(gegl_rectangle_bounding_box), (gegl_rectangle_intersect),
(gegl_rectangle_copy), (gegl_rectangle_contains),
(gegl_rectangle_equal), (gegl_rectangle_equal_coords):
* gegl/gegl-utils.h:
* gegl/gegl.h:
* operations/blur/box-blur.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/blur/gaussian-blur.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/color/brightness-contrast.c:
* operations/color/remap.c: (process):
* operations/color/stretch-contrast.c: (process):
* operations/core/buffer.c: (get_defined_region):
* operations/core/clone.c: (detect):
* operations/core/crop.c: (get_defined_region):
* operations/display/display.c: (process):
* operations/file-io/jpg-load.c: (get_defined_region):
* operations/file-io/load.c: (detect):
* operations/file-io/magick-load.c: (get_defined_region):
* operations/file-io/pixbuf.c: (get_defined_region):
* operations/file-io/png-load.c: (get_defined_region):
* operations/file-io/png-save.c: (process):
* operations/file-io/raw-load.c: (get_defined_region):
* operations/file-io/svg-load.c: (get_defined_region):
* operations/render/FractalExplorer.c: (process),
(get_defined_region):
* operations/render/checkerboard.c: (process):
* operations/render/color.c: (process):
* operations/render/introspect.c: (process):
* operations/render/noise.c: (process):
* operations/render/text.c: (process), (get_defined_region):
* operations/transform/affine.c: (bounding_box),
(get_defined_region), (calc_source_regions), (get_affected_region),
(process):
* operations/workshop/box-max.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/workshop/box-min.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/workshop/demosaic-simple.c: (process),
(get_defined_region), (get_source_rect), (get_affected_region):
* operations/workshop/gtk-display.c: (process):
* operations/workshop/kuwahara-max.c: (process),
(get_defined_region), (get_source_rect), (get_affected_region):
* operations/workshop/kuwahara-min.c: (process),
(get_defined_region), (get_source_rect), (get_affected_region):
* operations/workshop/kuwahara-switch.c: (process),
(get_defined_region), (get_source_rect), (get_affected_region):
* operations/workshop/kuwahara.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/workshop/mandelbrot.c: (process):
* operations/workshop/rawbayer-load.c: (get_defined_region):

svn path=/trunk/; revision=1310
parent 7322f0f7
2007-02-09 Øyvind Kolås <pippin@gimp.org>
%s/->w/->width/ , %s/\.w/.width/ for GeglRectangles.
* bin/editor.c: (cb_introspect), (cb_fit), (cb_fit_on_screen),
(cb_shrinkwrap):
* bin/export.c: (set_to_defined), (button_input_clicked),
(button_view_clicked), (button_render_clicked),
(gegl_buffer_export_png):
* bin/gegl-view.c: (computed_event), (expose_event):
* bin/gegl.c:
* gegl/buffer/gegl-buffer.c: (gegl_buffer_constructor),
(gegl_buffer_void), (gegl_buffer_set), (gegl_buffer_get_scaled),
(gegl_buffer_get):
* gegl/buffer/gegl-buffer.h:
* gegl/buffer/gegl-region-generic.c: (gegl_region_rectangle),
(gegl_region_get_clipbox), (gegl_region_get_rectangles),
(gegl_region_union_with_rect), (gegl_region_rect_in):
* gegl/gegl-debug-rect-visitor.c: (visit_node):
* gegl/gegl-eval-mgr.c: (gegl_eval_mgr_apply):
* gegl/gegl-graph.c: (source_invalidated):
* gegl/gegl-have-visitor.c: (visit_node):
* gegl/gegl-node-dynamic.c: (gegl_node_dynamic_set_need_rect),
(gegl_node_dynamic_set_result_rect):
* gegl/gegl-node.c: (source_invalidated), (gegl_node_blit),
(gegl_node_set_have_rect), (gegl_node_set_need_rect),
(gegl_node_set_result_rect), (gegl_node_process):
* gegl/gegl-operation-point-composer.c: (process_inner):
* gegl/gegl-operation-point-filter.c: (process_inner):
* gegl/gegl-operation.c: (gegl_operation_get_affected_region),
(gegl_operation_set_source_region), (gegl_operation_detect):
* gegl/gegl-processor.c: (gegl_node_new_processor),
(render_rectangle), (rect_area):
* gegl/gegl-types.h:
* gegl/gegl-utils.c: (gegl_rectangle_set),
(gegl_rectangle_bounding_box), (gegl_rectangle_intersect),
(gegl_rectangle_copy), (gegl_rectangle_contains),
(gegl_rectangle_equal), (gegl_rectangle_equal_coords):
* gegl/gegl-utils.h:
* gegl/gegl.h:
* operations/blur/box-blur.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/blur/gaussian-blur.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/color/brightness-contrast.c:
* operations/color/remap.c: (process):
* operations/color/stretch-contrast.c: (process):
* operations/core/buffer.c: (get_defined_region):
* operations/core/clone.c: (detect):
* operations/core/crop.c: (get_defined_region):
* operations/display/display.c: (process):
* operations/file-io/jpg-load.c: (get_defined_region):
* operations/file-io/load.c: (detect):
* operations/file-io/magick-load.c: (get_defined_region):
* operations/file-io/pixbuf.c: (get_defined_region):
* operations/file-io/png-load.c: (get_defined_region):
* operations/file-io/png-save.c: (process):
* operations/file-io/raw-load.c: (get_defined_region):
* operations/file-io/svg-load.c: (get_defined_region):
* operations/render/FractalExplorer.c: (process),
(get_defined_region):
* operations/render/checkerboard.c: (process):
* operations/render/color.c: (process):
* operations/render/introspect.c: (process):
* operations/render/noise.c: (process):
* operations/render/text.c: (process), (get_defined_region):
* operations/transform/affine.c: (bounding_box),
(get_defined_region), (calc_source_regions), (get_affected_region),
(process):
* operations/workshop/box-max.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/workshop/box-min.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/workshop/demosaic-simple.c: (process),
(get_defined_region), (get_source_rect), (get_affected_region):
* operations/workshop/gtk-display.c: (process):
* operations/workshop/kuwahara-max.c: (process),
(get_defined_region), (get_source_rect), (get_affected_region):
* operations/workshop/kuwahara-min.c: (process),
(get_defined_region), (get_source_rect), (get_affected_region):
* operations/workshop/kuwahara-switch.c: (process),
(get_defined_region), (get_source_rect), (get_affected_region):
* operations/workshop/kuwahara.c: (process), (get_defined_region),
(get_source_rect), (get_affected_region):
* operations/workshop/mandelbrot.c: (process):
* operations/workshop/rawbayer-load.c: (get_defined_region):
2007-02-09 Øyvind Kolås <pippin@gimp.org>
Added GEGL_TILE_EXIST message to tile protocol, used to query
......
......@@ -757,7 +757,7 @@ cb_introspect (GtkAction *action)
gtk_container_add (GTK_CONTAINER (window), introspect);
gtk_widget_set_size_request (introspect, bounding_box.w * 0.70, bounding_box.h * 0.70);
gtk_widget_set_size_request (introspect, bounding_box.width * 0.70, bounding_box.height * 0.70);
g_object_set (introspect, "scale", 0.70, NULL);
g_signal_connect (G_OBJECT (window), "delete-event",
......@@ -821,20 +821,20 @@ static void cb_fit (GtkAction *action)
width -= editor.view->allocation.width;
height -= editor.view->allocation.height;
hscale = (gdouble) editor.view->allocation.width / defined.w;
vscale = (gdouble) editor.view->allocation.height / defined.h;
hscale = (gdouble) editor.view->allocation.width / defined.width ;
vscale = (gdouble) editor.view->allocation.height / defined.height ;
if (hscale > vscale)
{
hscale = vscale;
y=0;
x= (editor.view->allocation.width - defined.w * hscale) / 2 / hscale;
x= (editor.view->allocation.width - defined.width * hscale) / 2 / hscale;
}
else
{
vscale = hscale;
x=0;
y= (editor.view->allocation.height - defined.h * vscale) / 2 / vscale;
y= (editor.view->allocation.height - defined.height * vscale) / 2 / vscale;
}
g_object_set (editor.view,
......@@ -843,8 +843,8 @@ static void cb_fit (GtkAction *action)
"scale", hscale,
NULL);
width += defined.w * hscale;
height += defined.h * vscale;
width += defined.width * hscale;
height += defined.height * vscale;
for (i=0;i<40;i++){
gtk_main_iteration ();
......@@ -855,7 +855,7 @@ static void cb_fit (GtkAction *action)
static void cb_fit_on_screen (GtkAction *action)
{
GeglRectangle defined = gegl_node_get_bounding_box (editor.gegl);
/*g_warning ("shrink wrap %i,%i %ix%i", defined.x, defined.y, defined.w, defined.h);*/
/*g_warning ("shrink wrap %i,%i %ix%i", defined.x, defined.y, defined.width , defined.h);*/
g_object_set (editor.view, "x", defined.x, "y", defined.y, NULL);
{
......@@ -880,7 +880,7 @@ static void cb_fit_on_screen (GtkAction *action)
static void cb_shrinkwrap (GtkAction *action)
{
GeglRectangle defined = gegl_node_get_bounding_box (editor.gegl);
/*g_warning ("shrink wrap %i,%i %ix%i", defined.x, defined.y, defined.w, defined.h);*/
/*g_warning ("shrink wrap %i,%i %ix%i", defined.x, defined.y, defined.width , defined.h);*/
gint i;
g_object_set (editor.view, "x", defined.x, "y", defined.y, NULL);
......@@ -900,8 +900,8 @@ static void cb_shrinkwrap (GtkAction *action)
height -= editor.view->allocation.height;
/* add the area consumed by the canvas content */
width += defined.w * scale;
height += defined.h * scale;
width += defined.width * scale;
height += defined.height * scale;
if (width > screen_width)
width = screen_width;
......
......@@ -26,9 +26,9 @@ static void set_to_defined (GtkWidget *export)
gtk_entry_set_text (x0, buf);
sprintf (buf, "%i", rect.y);
gtk_entry_set_text (y0, buf);
sprintf (buf, "%i", rect.w);
sprintf (buf, "%i", rect.width );
gtk_entry_set_text (width, buf);
sprintf (buf, "%i", rect.h);
sprintf (buf, "%i", rect.height );
gtk_entry_set_text (height, buf);
}
......@@ -65,9 +65,9 @@ static void button_input_clicked (GtkButton *button,
gtk_entry_set_text (x0, buf);
sprintf (buf, "%i", rect.y);
gtk_entry_set_text (y0, buf);
sprintf (buf, "%i", rect.w);
sprintf (buf, "%i", rect.width );
gtk_entry_set_text (width, buf);
sprintf (buf, "%i", rect.h);
sprintf (buf, "%i", rect.height );
gtk_entry_set_text (height, buf);
}
......@@ -83,16 +83,16 @@ static void button_view_clicked (GtkButton *button,
gchar buf[128];
g_object_get (G_OBJECT (editor.view), "x", &rect.x, "y" ,&rect.y, NULL);
rect.w= GTK_WIDGET(editor.view)->allocation.width;
rect.h= GTK_WIDGET(editor.view)->allocation.height;
rect.width = GTK_WIDGET(editor.view)->allocation.width;
rect.height = GTK_WIDGET(editor.view)->allocation.height;
sprintf (buf, "%i", rect.x);
gtk_entry_set_text (x0, buf);
sprintf (buf, "%i", rect.y);
gtk_entry_set_text (y0, buf);
sprintf (buf, "%i", rect.w);
sprintf (buf, "%i", rect.width );
gtk_entry_set_text (width, buf);
sprintf (buf, "%i", rect.h);
sprintf (buf, "%i", rect.height );
gtk_entry_set_text (height, buf);
}
......@@ -112,8 +112,8 @@ static void button_render_clicked (GtkButton *button,
rect.x = atoi (gtk_entry_get_text (x0));
rect.y = atoi (gtk_entry_get_text (y0));
rect.w = atoi (gtk_entry_get_text (width));
rect.h = atoi (gtk_entry_get_text (height));
rect.width = atoi (gtk_entry_get_text (width));
rect.height = atoi (gtk_entry_get_text (height));
path = gtk_entry_get_text (pathe);
node = GEGL_VIEW (editor.view)->node;
......@@ -252,7 +252,7 @@ gegl_buffer_export_png (GeglBuffer *gegl_buffer,
GeglRectangle *rect,
const gchar *path)
{
gint row_stride = rect->w * 4;
gint row_stride = rect->width * 4;
FILE *fp;
gint i;
png_struct *png;
......@@ -308,7 +308,7 @@ gegl_buffer_export_png (GeglBuffer *gegl_buffer,
png_init_io (png, fp);
png_set_IHDR (png, info,
rect->w, rect->h, bit_depth, PNG_COLOR_TYPE_RGB_ALPHA,
rect->width, rect->height, bit_depth, PNG_COLOR_TYPE_RGB_ALPHA,
PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_DEFAULT);
white.red = 0xff;
......@@ -325,9 +325,9 @@ gegl_buffer_export_png (GeglBuffer *gegl_buffer,
pixels = g_malloc0 (row_stride);
for (i=0; i< rect->h; i++)
for (i=0; i< rect->height; i++)
{
GeglRectangle line = {rect->x, rect->y + i, rect->w, 1};
GeglRectangle line = {rect->x, rect->y + i, rect->width , 1};
gegl_buffer_get (gegl_buffer, &line, 1.0, babl_format (format_string), pixels);
png_write_rows (png, &pixels, 1);
}
......
......@@ -136,8 +136,8 @@ computed_event (GeglNode *self,
{
gint x = view->scale * (rect->x - view->x);
gint y = view->scale * (rect->y - view->y);
gint w = ceil (view->scale * rect->w);
gint h = ceil (view->scale * rect->h);
gint w = ceil (view->scale * rect->width );
gint h = ceil (view->scale * rect->height);
gtk_widget_queue_draw_area (GTK_WIDGET (view), x, y, w, h);
}
......@@ -359,10 +359,10 @@ expose_event (GtkWidget *widget,
roi.x = view->x + (rectangles[i].x / view->scale);
roi.y = view->y + (rectangles[i].y / view->scale);
roi.w = rectangles[i].width;
roi.h = rectangles[i].height;
roi.width = rectangles[i].width;
roi.height = rectangles[i].height;
buf = g_malloc ((roi.w+1) * (roi.h+1) * 3);
buf = g_malloc ((roi.width +1) * (roi.height+1) * 3);
/* FIXME: this padding should not be needed, but it avoids some segfaults */
gegl_node_blit (view->node,
......@@ -378,7 +378,7 @@ expose_event (GtkWidget *widget,
rectangles[i].x, rectangles[i].y,
rectangles[i].width, rectangles[i].height,
GDK_RGB_DITHER_NONE,
buf, roi.w * 3);
buf, roi.width * 3);
g_free (buf);
}
......
......@@ -40,7 +40,7 @@
/*FIXME: this should be in gegl.h*/
/*FIXME: this should be in gegl.height */
GeglNode * gegl_node_get_output_proxy (GeglNode *graph,
const gchar *name);
......
......@@ -365,8 +365,8 @@ gegl_buffer_constructor (GType type,
buffer->abyss_x = self.x;
buffer->abyss_y = self.y;
buffer->abyss_width = self.w;
buffer->abyss_height = self.h;
buffer->abyss_width = self.width ;
buffer->abyss_height = self.height;
}
/* compute our own total shift */
......@@ -620,7 +620,6 @@ gegl_buffer_void (GeglBuffer *buffer)
factor*=2;
}
}
}
......@@ -895,8 +894,8 @@ gegl_buffer_set (GeglBuffer *buffer,
"source", buffer,
"x", rect->x,
"y", rect->y,
"width", rect->w,
"height", rect->h,
"width", rect->width ,
"height", rect->height,
NULL);
gegl_buffer_iterate (sub_buf, src, TRUE, format, 0);
g_object_unref (sub_buf);
......@@ -920,8 +919,8 @@ static void gegl_buffer_get_scaled (GeglBuffer *buffer,
"source", buffer,
"x", rect->x,
"y", rect->y,
"width", rect->w,
"height", rect->h,
"width", rect->width ,
"height", rect->height,
NULL);
gegl_buffer_iterate (sub_buf, dst, FALSE, format, level);
g_object_unref (sub_buf);
......@@ -1243,8 +1242,8 @@ gegl_buffer_get (GeglBuffer *buffer,
gegl_buffer_iterate (buffer, dest_buf, FALSE, format, 0);
return;
}
if (rect->w == 0 ||
rect->h == 0)
if (rect->width == 0 ||
rect->height == 0)
return;
if (scale == 1.0)
{
......@@ -1254,8 +1253,8 @@ gegl_buffer_get (GeglBuffer *buffer,
else
{
gint level=0;
gint buf_width = rect->w/scale;
gint buf_height = rect->h/scale;
gint buf_width = rect->width /scale;
gint buf_height = rect->height/scale;
gint bpp = BABL(format)->format.bytes_per_pixel;
GeglRectangle sample_rect = {rect->x,
rect->y,
......@@ -1275,8 +1274,8 @@ gegl_buffer_get (GeglBuffer *buffer,
buf_height/=factor;
/* ensure we always have some data to sample from */
sample_rect.w += factor * 2;
sample_rect.h += factor * 2;
sample_rect.width += factor * 2;
sample_rect.height += factor * 2;
buf_width+=2;
buf_height+=2;
......@@ -1287,7 +1286,7 @@ gegl_buffer_get (GeglBuffer *buffer,
scale < 1.0 + 0.001)
{ /* avoid resampling if the pyramidial level we've got is close */
gint y;
for (y=0;y<rect->h;y++)
for (y=0;y<rect->height;y++)
{
gint sy;
guchar *dst;
......@@ -1298,10 +1297,10 @@ gegl_buffer_get (GeglBuffer *buffer,
if (sy>buf_height)
sy=buf_height-1;
dst = ((guchar*)dest_buf) + y * rect->w * bpp;
dst = ((guchar*)dest_buf) + y * rect->width * bpp;
src_base = ((guchar*)sample_buf) + sy * buf_width * bpp;
memcpy (dst, src_base, bpp * rect->w);
memcpy (dst, src_base, bpp * rect->width );
}
}
else if (BABL(format)->format.type[0] == (BablType*)babl_type ("u8") /*&&
......@@ -1311,8 +1310,8 @@ gegl_buffer_get (GeglBuffer *buffer,
{ /* do bilinear resampling if we're 8bit (which projections are) */
resample_bilinear_u8 (dest_buf,
sample_buf,
rect->w,
rect->h,
rect->width ,
rect->height,
buf_width,
buf_height,
scale,
......@@ -1322,8 +1321,8 @@ gegl_buffer_get (GeglBuffer *buffer,
{
resample_nearest (dest_buf,
sample_buf,
rect->w,
rect->h,
rect->width ,
rect->height,
buf_width,
buf_height,
scale,
......
......@@ -77,13 +77,16 @@ void gegl_buffer_set (GeglBuffer *buffer,
void *format,
void *src);
GeglStorage * gegl_buffer_storage (GeglBuffer *buffer);
GeglRectangle gegl_buffer_get_abyss (GeglBuffer *buffer);
GeglStorage * gegl_buffer_storage (GeglBuffer *buffer);
GeglRectangle gegl_buffer_get_abyss (GeglBuffer *buffer);
gint gegl_buffer_leaks (void);
gint gegl_buffer_leaks (void);
void gegl_buffer_stats (void);
void gegl_buffer_stats (void);
void gegl_buffer_save (GeglBuffer *buffer,
const gchar *path,
GeglRectangle *roi);
/* the following are remnants of how horizon used the precursor of the
* tile manager for it's purposes. For now it is not used
......
......@@ -138,7 +138,7 @@ gegl_region_rectangle (GeglRectangle *rectangle)
g_return_val_if_fail (rectangle != NULL, NULL);
if (rectangle->w <= 0 || rectangle->h <= 0)
if (rectangle->width <= 0 || rectangle->height <= 0)
return gegl_region_new();
temp = g_slice_new (GeglRegion);
......@@ -147,8 +147,8 @@ gegl_region_rectangle (GeglRectangle *rectangle)
temp->rects = &temp->extents;
temp->extents.x1 = rectangle->x;
temp->extents.y1 = rectangle->y;
temp->extents.x2 = rectangle->x + rectangle->w;
temp->extents.y2 = rectangle->y + rectangle->h;
temp->extents.x2 = rectangle->x + rectangle->width ;
temp->extents.y2 = rectangle->y + rectangle->height;
temp->size = 1;
return temp;
......@@ -193,8 +193,8 @@ gegl_region_get_clipbox (GeglRegion *region,
rectangle->x = region->extents.x1;
rectangle->y = region->extents.y1;
rectangle->w = region->extents.x2 - region->extents.x1;
rectangle->h = region->extents.y2 - region->extents.y1;
rectangle->width = region->extents.x2 - region->extents.x1;
rectangle->height = region->extents.y2 - region->extents.y1;
}
......@@ -227,8 +227,8 @@ gegl_region_get_rectangles (GeglRegion *region,
rect = region->rects[i];
(*rectangles)[i].x = rect.x1;
(*rectangles)[i].y = rect.y1;
(*rectangles)[i].w= rect.x2 - rect.x1;
(*rectangles)[i].h= rect.y2 - rect.y1;
(*rectangles)[i].width = rect.x2 - rect.x1;
(*rectangles)[i].height = rect.y2 - rect.y1;
}
}
......@@ -250,15 +250,15 @@ gegl_region_union_with_rect (GeglRegion *region,
g_return_if_fail (region != NULL);
g_return_if_fail (rect != NULL);
if (rect->w <= 0 || rect->h <= 0)
if (rect->width <= 0 || rect->height <= 0)
return;
tmp_region.rects = &tmp_region.extents;
tmp_region.numRects = 1;
tmp_region.extents.x1 = rect->x;
tmp_region.extents.y1 = rect->y;
tmp_region.extents.x2 = rect->x + rect->w;
tmp_region.extents.y2 = rect->y + rect->h;
tmp_region.extents.x2 = rect->x + rect->width ;
tmp_region.extents.y2 = rect->y + rect->height;
tmp_region.size = 1;
gegl_region_union (region, &tmp_region);
......@@ -1617,8 +1617,8 @@ gegl_region_rect_in (GeglRegion *region,
prect->x1 = rx;
prect->y1 = ry;
prect->x2 = rx + rectangle->w;
prect->y2 = ry + rectangle->h;
prect->x2 = rx + rectangle->width ;
prect->y2 = ry + rectangle->height;
/* this is (just) a useful optimization */
if ((region->numRects == 0) || !EXTENTCHECK (&region->extents, prect))
......
......@@ -70,11 +70,11 @@ visit_node (GeglVisitor *self,
"\tresult: %ix%i %i,%i\n"
"\trefs: %i",
gegl_node_get_debug_name (node),
node->have_rect.w, node->have_rect.h,
node->have_rect.width , node->have_rect.height,
node->have_rect.x, node->have_rect.y,
dynamic->need_rect.w, dynamic->need_rect.h,
dynamic->need_rect.width , dynamic->need_rect.height,
dynamic->need_rect.x, dynamic->need_rect.y,
dynamic->result_rect.w, dynamic->result_rect.h,
dynamic->result_rect.width , dynamic->result_rect.height,
dynamic->result_rect.x, dynamic->result_rect.y,
dynamic->refs);
}
......@@ -111,8 +111,8 @@ gegl_eval_mgr_apply (GeglEvalMgr *self,
gegl_visitor_dfs_traverse (have_visitor, GEGL_VISITABLE(root));
g_object_unref (have_visitor);
if (self->roi.w==-1 &&
self->roi.h==-1)
if (self->roi.width ==-1 &&
self->roi.height ==-1)
{
GeglRectangle *root_have_rect = gegl_node_get_have_rect (root);
g_assert (root_have_rect);
......@@ -120,7 +120,7 @@ gegl_eval_mgr_apply (GeglEvalMgr *self,
}
gegl_node_set_need_rect (root, context_id, self->roi.x, self->roi.y,
self->roi.w, self->roi.h);
self->roi.width , self->roi.height);
root->is_root = TRUE;
need_visitor = g_object_new (GEGL_TYPE_NEED_VISITOR, "id", context_id, NULL);
......
......@@ -161,7 +161,7 @@ source_invalidated (GeglNode *source,
destination_name,
source_name,
rect->x, rect->y,
rect->w, rect->h);
rect->width , rect->height);
dirty_rect = *rect;
......
......@@ -68,7 +68,7 @@ visit_node (GeglVisitor *self,
if (!operation)
return;
rect = gegl_operation_get_defined_region (operation);
gegl_node_set_have_rect (operation->node, rect.x, rect.y, rect.w, rect.h);
gegl_node_set_have_rect (operation->node, rect.x, rect.y, rect.width, rect.height);
time = gegl_ticks () - time;
gegl_instrument ("process", gegl_node_get_operation (node), time);
......
......@@ -63,8 +63,8 @@ gegl_node_dynamic_set_need_rect (GeglNodeDynamic *node,
g_assert (node);
node->need_rect.x = x;
node->need_rect.y = y;
node->need_rect.w = width;
node->need_rect.h = height;
node->need_rect.width = width;
node->need_rect.height = height;
}
GeglRectangle *
......@@ -83,8 +83,8 @@ gegl_node_dynamic_set_result_rect (GeglNodeDynamic *node,
g_assert (node);
node->result_rect.x = x;
node->result_rect.y = y;
node->result_rect.w = width;
node->result_rect.h = height;
node->result_rect.width = width;
node->result_rect.height = height;
}
GeglRectangle *
......
......@@ -450,7 +450,7 @@ source_invalidated (GeglNode *source,
gegl_pad_get_name (destination_pad),
source_name,
rect->x, rect->y,
rect->w, rect->h);
rect->width , rect->height);
if (destination->operation)
{
......@@ -760,8 +760,8 @@ void gegl_node_blit (GeglNode *node,
"source", buffer,
"x", roi->x,
"y", roi->y,
"width", roi->w,
"height", roi->h,
"width", roi->width ,
"height", roi->height,
NULL);
gegl_buffer_get (roi_buf, NULL, 1.0, format, destination_buf);
g_object_unref (roi_buf);
......@@ -1356,8 +1356,8 @@ gegl_node_set_have_rect (GeglNode *node,
g_assert (node);
node->have_rect.x = x;
node->have_rect.y = y;
node->have_rect.w = width;
node->have_rect.h = height;
node->have_rect.width = width;
node->have_rect.height = height;
}
GeglRectangle *
......@@ -1378,8 +1378,8 @@ gegl_node_set_need_rect (GeglNode *node,
g_assert (node);
dynamic->need_rect.x = x;
dynamic->need_rect.y = y;
dynamic->need_rect.w = width;
dynamic->need_rect.h = height;
dynamic->need_rect.width = width;
dynamic->need_rect.height = height;
}
GeglRectangle *
......@@ -1403,8 +1403,8 @@ gegl_node_set_result_rect (GeglNode *node,
g_assert (dynamic);
dynamic->result_rect.x = x;
dynamic->result_rect.y = y;
dynamic->result_rect.w = width;
dynamic->result_rect.h = height;
dynamic->result_rect.width = width;
dynamic->result_rect.height = height;
}
GeglRectangle *
......@@ -1538,7 +1538,7 @@ gegl_node_process (GeglNode *self)
g_value_unset (&value);
}
gegl_node_dynamic_set_result_rect (dynamic, defined.x, defined.y, defined.w, defined.h);
gegl_node_dynamic_set_result_rect (dynamic, defined.x, defined.y, defined.width , defined.h);
gegl_operation_process (self->operation, &defined, "foo");
gegl_node_remove_dynamic (self, &defined);
g_object_unref (buffer);
......
......@@ -72,7 +72,7 @@ process_inner (GeglOperation *operation,
g_assert (gegl_buffer_get_format (input));
if ( (result->w>0) && (result->h>0))
if ( (result->width >0) && (result->height>0))
{
GeglBuffer *output;
......@@ -134,8 +134,8 @@ process_inner (GeglOperation *operation,
"format", point_composer->format,
"x", result->x,
"y", result->y,
"width", result->w,
"height", result->h,
"width", result->width ,
"height", result->height,
NULL);
buf = g_malloc (4 * sizeof (gfloat) * gegl_buffer_pixels (output));
......
......@@ -60,11 +60,11 @@ process_inner (GeglOperation *operation,
"format", point_filter->format,
"x", result->x,
"y", result->y,
"width", result->w,
"height", result->h,
"width", result->width ,
"height", result->height,
NULL);
if ( (result->w>0) && (result->h>0) )
if ( (result->width >0) && (result->height>0) )
{
buf = g_malloc (4 * sizeof (gfloat) * gegl_buffer_pixels (output));
......
......@@ -128,8 +128,8 @@ gegl_operation_get_affected_region (GeglOperation *self,
GeglOperationClass *klass;
klass = GEGL_OPERATION_GET_CLASS (self);
if (region.w == 0 ||
region.h == 0)
if (region.width == 0 ||
region.height == 0)
return region;
if (klass->get_affected_region)
return klass->get_affected_region (self, input_pad, region);
......@@ -252,7 +252,7 @@ gegl_operation_set_source_region (GeglOperation *operation,
*/
gegl_node_set_need_rect (child, context_id,
child_need.x, child_need.y,
child_need.w, child_need.h);
child_need.width, child_need.height);
}
static GeglRectangle
......@@ -495,9 +495,9 @@ gegl_operation_detect (GeglOperation *operation,
}
if (x>=node->have_rect.x &&
x<node->have_rect.x+node->have_rect.w &&
x<node->have_rect.x+node->have_rect.width &&
y>=node->have_rect.y &&
y<node->have_rect.y+node->have_rect.h)
y<node->have_rect.y+node->have_rect.height)
{
return node;
}
......
......@@ -234,8 +234,8 @@ gegl_node_new_processor (GeglNode *node,