fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 12:18:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[region] Expand rect to rectangle in a couple of names

Browse source 
Specifically,

	cairo_region_union_rect  ->  cairo_region_union_rectangle
	cairo_region_create_rect ->  cairo_region_create_rectangle

Also delete cairo_region_clear() which is not that useful.
This commit is contained in:
Søren Sandmann Pedersen 2009-02-21 08:13:25 -05:00 • committed by Søren Sandmann Pedersen
parent bf6d9bc175
commit 4b3245481c
9 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cairo-analysis-surface.c
View file

@ -234,7 +234,7 @@ _add_operation (cairo_analysis_surface_t *surface,
* this region will be emitted as native operations.
*/
surface->has_supported = TRUE;
status = cairo_region_union_rect (surface->supported_region, rect);
status = cairo_region_union_rectangle (surface->supported_region, rect);
return status;
}
@ -243,7 +243,7 @@ _add_operation (cairo_analysis_surface_t *surface,
* emitted.
*/
surface->has_unsupported = TRUE;
status = cairo_region_union_rect (surface->fallback_region, rect);
status = cairo_region_union_rectangle (surface->fallback_region, rect);
/* The status CAIRO_INT_STATUS_IMAGE_FALLBACK is used to indicate
* unsupported operations to the meta surface as using

4
src/cairo-clip.c
View file

@ -201,7 +201,7 @@ _cairo_clip_intersect_to_region (cairo_clip_t *clip,
if (clip->all_clipped) {
cairo_region_t *clip_rect;
clip_rect = cairo_region_create_rect (&clip->surface_rect);
clip_rect = cairo_region_create_rectangle (&clip->surface_rect);
status = cairo_region_intersect (region, clip_rect);
@ -223,7 +223,7 @@ _cairo_clip_intersect_to_region (cairo_clip_t *clip,
if (clip->surface) {
cairo_region_t *clip_rect;
clip_rect = cairo_region_create_rect (&clip->surface_rect);
clip_rect = cairo_region_create_rectangle (&clip->surface_rect);
status = cairo_region_intersect (region, clip_rect);

16
src/cairo-region.c
View file

@ -58,7 +58,7 @@ cairo_region_create (void)
}
cairo_region_t *
cairo_region_create_rect (cairo_rectangle_int_t *rect)
cairo_region_create_rectangle (cairo_rectangle_int_t *rect)
{
cairo_region_t *region = _cairo_malloc (sizeof (cairo_region_t));
@ -162,16 +162,6 @@ cairo_region_status (cairo_region_t *region)
return region->status;
}
void
cairo_region_clear (cairo_region_t *region)
{
if (region->status)
return;
pixman_region32_fini (&region->rgn);
pixman_region32_init (&region->rgn);
}
cairo_status_t
cairo_region_subtract (cairo_region_t *dst, cairo_region_t *other)
{
@ -219,8 +209,8 @@ cairo_region_union (cairo_region_t *dst,
}
cairo_status_t
cairo_region_union_rect (cairo_region_t *dst,
cairo_rectangle_int_t *rect)
cairo_region_union_rectangle (cairo_region_t *dst,
cairo_rectangle_int_t *rect)
{
if (!pixman_region32_union_rect (&dst->rgn, &dst->rgn,
rect->x, rect->y,

2
src/cairo-surface-fallback.c
View file

@ -567,7 +567,7 @@ _clip_and_composite_trapezoids (const cairo_pattern_t *src,
* _cairo_surface_fill_rectangles() or to drawing with a
* clip region, then we have an additional region to clear.
*/
clear_region = cairo_region_create_rect (&extents);
clear_region = cairo_region_create_rectangle (&extents);
status = cairo_region_status (clear_region);
if (unlikely (status))

4
src/cairo-surface.c
View file

@ -2692,7 +2692,7 @@ _cairo_surface_composite_fixup_unbounded_internal (cairo_surface_t *dst,
dst_rectangle.width = width;
dst_rectangle.height = height;
clear_region = cairo_region_create_rect (&dst_rectangle);
clear_region = cairo_region_create_rectangle (&dst_rectangle);
drawn_rectangle = dst_rectangle;
@ -2708,7 +2708,7 @@ _cairo_surface_composite_fixup_unbounded_internal (cairo_surface_t *dst,
/* Now compute the area that is in dst_rectangle but not in drawn_rectangle
*/
drawn_region = cairo_region_create_rect (&drawn_rectangle);
drawn_region = cairo_region_create_rectangle (&drawn_rectangle);
has_drawn_region = TRUE;
status = cairo_region_subtract (clear_region, drawn_region);

2
src/cairo-traps.c
View file

@ -649,7 +649,7 @@ _cairo_traps_extract_region (const cairo_traps_t *traps,
rect.width = x2 - x1;
rect.height = y2 - y1;
status = cairo_region_union_rect (r, &rect);
status = cairo_region_union_rectangle (r, &rect);
if (unlikely (status))
{
cairo_region_destroy (r);

2
src/cairo-xlib-surface.c
View file

@ -2302,7 +2302,7 @@ _cairo_xlib_surface_set_clip_region (void *abstract_surface,
* is necessary so we don't wrap around when we convert cairo's
* 32 bit region into 16 bit rectangles.
*/
bounded = cairo_region_create_rect (&rect);
bounded = cairo_region_create_rectangle (&rect);
status = cairo_region_intersect (bounded, region);
if (unlikely (status)) {
cairo_region_destroy (bounded);

7
src/cairo.h
View file

@ -2368,7 +2368,7 @@ cairo_public cairo_region_t *
cairo_region_create (void);
cairo_public cairo_region_t *
cairo_region_create_rect (cairo_rectangle_int_t *rect);
cairo_region_create_rectangle (cairo_rectangle_int_t *rect);
cairo_public cairo_region_t *
cairo_region_copy (cairo_region_t *original);
@ -2401,9 +2401,6 @@ cairo_region_contains_rectangle (cairo_region_t *region,
cairo_public cairo_bool_t
cairo_region_contains_point (cairo_region_t *region, int x, int y);
cairo_public void
cairo_region_clear (cairo_region_t *region);
cairo_public void
cairo_region_translate (cairo_region_t *region, int dx, int dy);
@ -2417,7 +2414,7 @@ cairo_public cairo_status_t
cairo_region_union (cairo_region_t *dst, cairo_region_t *other);
cairo_public cairo_status_t
cairo_region_union_rect (cairo_region_t *dst, cairo_rectangle_int_t *rect);
cairo_region_union_rectangle (cairo_region_t *dst, cairo_rectangle_int_t *rectangle);
/* Functions to be used while debugging (not intended for use in production code) */

5
src/cairoint.h
View file

@ -2695,7 +2695,7 @@ slim_hidden_proto (cairo_user_to_device);
slim_hidden_proto (cairo_user_to_device_distance);
slim_hidden_proto (cairo_version_string);
slim_hidden_proto (cairo_region_create);
slim_hidden_proto (cairo_region_create_rect);
slim_hidden_proto (cairo_region_create_rectangle);
slim_hidden_proto (cairo_region_copy);
slim_hidden_proto (cairo_region_destroy);
slim_hidden_proto (cairo_region_status);
@ -2705,12 +2705,11 @@ slim_hidden_proto (cairo_region_get_rectangle);
slim_hidden_proto (cairo_region_empty);
slim_hidden_proto (cairo_region_contains_rectangle);
slim_hidden_proto (cairo_region_contains_point);
slim_hidden_proto (cairo_region_clear);
slim_hidden_proto (cairo_region_translate);
slim_hidden_proto (cairo_region_subtract);
slim_hidden_proto (cairo_region_intersect);
slim_hidden_proto (cairo_region_union);
slim_hidden_proto (cairo_region_union_rect);
slim_hidden_proto (cairo_region_union_rectangle);
#if CAIRO_HAS_PNG_FUNCTIONS