[cairo-commit] src/cairo-clip.c src/cairo.h src/cairoint.h src/cairo-region.c src/cairo-surface-fallback.c

Søren Sandmann Pedersen sandmann at kemper.freedesktop.org
Tue Mar 31 02:49:20 PDT 2009


 src/cairo-clip.c             |    2 +-
 src/cairo-region.c           |    6 +++---
 src/cairo-surface-fallback.c |    2 +-
 src/cairo.h                  |    2 +-
 src/cairoint.h               |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 80d5b53b474c94219c51ae16dcc19098a2d86165
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Mar 31 05:47:44 2009 -0400

    [region] Change name of cairo_region_empty() to cairo_region_is_empty()

diff --git a/src/cairo-clip.c b/src/cairo-clip.c
index cc43c03..7066b93 100644
--- a/src/cairo-clip.c
+++ b/src/cairo-clip.c
@@ -348,7 +348,7 @@ _cairo_clip_intersect_region (cairo_clip_t    *clip,
     clip->serial = _cairo_surface_allocate_clip_serial (target);
     cairo_region_destroy (region);
 
-    if (!clip->region || cairo_region_empty (clip->region))
+    if (!clip->region || cairo_region_is_empty (clip->region))
 	_cairo_clip_set_all_clipped (clip, target);
 
     return status;
diff --git a/src/cairo-region.c b/src/cairo-region.c
index 3f2b978..6bdfd24 100644
--- a/src/cairo-region.c
+++ b/src/cairo-region.c
@@ -481,7 +481,7 @@ cairo_region_union_rectangle (cairo_region_t *dst,
 slim_hidden_def (cairo_region_union_rectangle);
 
 /**
- * cairo_region_empty:
+ * cairo_region_is_empty:
  * @region: a #cairo_region_t
  *
  * Checks whether @region is empty.
@@ -491,14 +491,14 @@ slim_hidden_def (cairo_region_union_rectangle);
  * Since: 1.10
  **/
 cairo_bool_t
-cairo_region_empty (cairo_region_t *region)
+cairo_region_is_empty (cairo_region_t *region)
 {
     if (region->status)
 	return TRUE;
 
     return ! pixman_region32_not_empty (&region->rgn);
 }
-slim_hidden_def (cairo_region_empty);
+slim_hidden_def (cairo_region_is_empty);
 
 /**
  * cairo_region_translate:
diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c
index cbe92b2..a78c6ad 100644
--- a/src/cairo-surface-fallback.c
+++ b/src/cairo-surface-fallback.c
@@ -583,7 +583,7 @@ _clip_and_composite_trapezoids (const cairo_pattern_t *src,
             if (unlikely (status))
                 goto out;
 
-            if (cairo_region_empty (clear_region)) {
+            if (cairo_region_is_empty (clear_region)) {
                 cairo_region_destroy (clear_region);
 		clear_region = NULL;
             }
diff --git a/src/cairo.h b/src/cairo.h
index 917d364..a9b4f61 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -2392,7 +2392,7 @@ cairo_region_get_rectangle (cairo_region_t        *region,
 			    cairo_rectangle_int_t *rectangle);
 
 cairo_public cairo_bool_t
-cairo_region_empty (cairo_region_t *region);
+cairo_region_is_empty (cairo_region_t *region);
 
 cairo_public cairo_region_overlap_t
 cairo_region_contains_rectangle (cairo_region_t *region,
diff --git a/src/cairoint.h b/src/cairoint.h
index 6c5fd5a..21b2864 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -2702,7 +2702,7 @@ slim_hidden_proto (cairo_region_status);
 slim_hidden_proto (cairo_region_get_extents);
 slim_hidden_proto (cairo_region_num_rectangles);
 slim_hidden_proto (cairo_region_get_rectangle);
-slim_hidden_proto (cairo_region_empty);
+slim_hidden_proto (cairo_region_is_empty);
 slim_hidden_proto (cairo_region_contains_rectangle);
 slim_hidden_proto (cairo_region_contains_point);
 slim_hidden_proto (cairo_region_translate);


More information about the cairo-commit mailing list