Minor cleanup work on macros

(bzr r6546)

5 files changed, 11 insertions, 11 deletions

diff --git a/src/display/inkscape-cairo.cpp b/src/display/inkscape-cairo.cpp
index c52404b23..d4a9f7062 100644
--- a/src/display/inkscape-cairo.cpp
+++ b/src/display/inkscape-cairo.cpp
@@ -32,7 +32,7 @@
 cairo_t *
 nr_create_cairo_context_for_data (NRRectL *area, NRRectL *buf_area, unsigned char *px, unsigned int rowstride)
 {
-    if (!nr_rect_l_test_intersect (buf_area, area))
+    if (!nr_rect_l_test_intersect_ptr(buf_area, area))
         return NULL;
 
     NRRectL clip;
diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp
index 0fbc068a1..a1a14ef1a 100644
--- a/src/display/nr-arena-glyphs.cpp
+++ b/src/display/nr-arena-glyphs.cpp
@@ -211,7 +211,7 @@ nr_arena_glyphs_update(NRArenaItem *item, NRRectL */*area*/, NRGC *gc, guint /*s
             bbox.y1 = narea.y1 + glyphs->y;
         }
     }
-    if (nr_rect_d_test_empty(&bbox)) return NR_ARENA_ITEM_STATE_ALL;
+    if (nr_rect_d_test_empty(bbox)) return NR_ARENA_ITEM_STATE_ALL;
 
     item->bbox.x0 = (gint32)(bbox.x0 - 1.0);
     item->bbox.y0 = (gint32)(bbox.y0 - 1.0);
@@ -296,7 +296,7 @@ nr_arena_glyphs_fill_mask(NRArenaGlyphs *glyphs, NRRectL *area, NRPixBlock *m)
 
     NRArenaItem *item = NR_ARENA_ITEM(glyphs);
 
-    if (glyphs->rfont && nr_rect_l_test_intersect(area, &item->bbox)) {
+    if (glyphs->rfont && nr_rect_l_test_intersect_ptr(area, &item->bbox)) {
         raster_glyph *g = glyphs->rfont->GetGlyph(glyphs->glyph);
         if ( g ) g->Blit(NR::Point(glyphs->x, glyphs->y), *m);
     }
@@ -308,7 +308,7 @@ static guint
 nr_arena_glyphs_stroke_mask(NRArenaGlyphs *glyphs, NRRectL *area, NRPixBlock *m)
 {
     NRArenaItem *item = NR_ARENA_ITEM(glyphs);
-    if (glyphs->sfont && nr_rect_l_test_intersect(area, &item->bbox)) {
+    if (glyphs->sfont && nr_rect_l_test_intersect_ptr(area, &item->bbox)) {
         raster_glyph *g=glyphs->sfont->GetGlyph(glyphs->glyph);
         if ( g ) g->Blit(NR::Point(glyphs->x, glyphs->y),*m);
     }
diff --git a/src/display/nr-arena-item.cpp b/src/display/nr-arena-item.cpp
index 195dba2f0..a6a04bb8b 100644
--- a/src/display/nr-arena-item.cpp
+++ b/src/display/nr-arena-item.cpp
@@ -236,7 +236,7 @@ nr_arena_item_invoke_update (NRArenaItem *item, NRRectL *area, NRGC *gc,
         return item->state;
     /* Test whether to return immediately */
     if (area && (item->state & NR_ARENA_ITEM_STATE_BBOX)) {
-        if (!nr_rect_l_test_intersect (area, &item->bbox))
+        if (!nr_rect_l_test_intersect_ptr(area, &item->bbox))
             return item->state;
     }
 
@@ -321,7 +321,7 @@ nr_arena_item_invoke_render (cairo_t *ct, NRArenaItem *item, NRRectL const *area
 
     NRRectL carea;
     nr_rect_l_intersect (&carea, area, &item->bbox);
-    if (nr_rect_l_test_empty (&carea))
+    if (nr_rect_l_test_empty(carea))
         return item->state | NR_ARENA_ITEM_STATE_RENDER;
     if (item->filter && filter) {
         item->filter->area_enlarge (carea, item->ctm);
@@ -607,7 +607,7 @@ nr_arena_item_invoke_clip (NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
             (&item->bbox)->y0, (&item->bbox)->x1, (&item->bbox)->y1);
 #endif
 
-    if (item->visible && nr_rect_l_test_intersect (area, &item->bbox)) {
+    if (item->visible && nr_rect_l_test_intersect_ptr(area, &item->bbox)) {
         /* Need render that item */
         if (((NRArenaItemClass *) NR_OBJECT_GET_CLASS (item))->clip) {
             return ((NRArenaItemClass *) NR_OBJECT_GET_CLASS (item))->
diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp
index b8723e635..325681650 100644
--- a/src/display/nr-arena-shape.cpp
+++ b/src/display/nr-arena-shape.cpp
@@ -299,7 +299,7 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
     shape->approx_bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F);
     shape->approx_bbox.x1 = (gint32)(boundingbox[0][1] + 1.9999F);
     shape->approx_bbox.y1 = (gint32)(boundingbox[1][1] + 1.9999F);
-    if ( area && nr_rect_l_test_intersect(area, &shape->approx_bbox) ) shape->delayed_shp=false;
+    if ( area && nr_rect_l_test_intersect_ptr(area, &shape->approx_bbox) ) shape->delayed_shp=false;
 
     /* Release state data */
     if (TRUE || !NR::transform_equalp(gc->transform, shape->ctm, NR_EPSILON)) {
@@ -850,7 +850,7 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock
     } else {
 
     if ( shape->delayed_shp ) {
-        if ( nr_rect_l_test_intersect(area, &item->bbox) ) {
+        if ( nr_rect_l_test_intersect_ptr(area, &item->bbox) ) {
             NRGC   tempGC(NULL);
             tempGC.transform=shape->ctm;
             shape->delayed_shp = false;
@@ -1015,7 +1015,7 @@ nr_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
     if (!shape->curve) return item->state;
 
     if ( shape->delayed_shp || shape->fill_shp == NULL) { // we need a fill shape no matter what
-        if ( nr_rect_l_test_intersect(area, &item->bbox) ) {
+        if ( nr_rect_l_test_intersect_ptr(area, &item->bbox) ) {
             NRGC   tempGC(NULL);
             tempGC.transform=shape->ctm;
             shape->delayed_shp = false;
diff --git a/src/display/nr-arena.cpp b/src/display/nr-arena.cpp
index 77701d249..ce13072b9 100644
--- a/src/display/nr-arena.cpp
+++ b/src/display/nr-arena.cpp
@@ -93,7 +93,7 @@ nr_arena_request_render_rect (NRArena *arena, NRRectL *area)
     nr_return_if_fail (NR_IS_ARENA (arena));
     nr_return_if_fail (area != NULL);
 
-    if (aobject->callbacks && area && !nr_rect_l_test_empty (area)) {
+    if (aobject->callbacks && area && !nr_rect_l_test_empty_ptr(area)) {
         for (unsigned int i = 0; i < aobject->callbacks->length; i++) {
             NRObjectListener *listener = aobject->callbacks->listeners + i;
             NRArenaEventVector *avector = (NRArenaEventVector *) listener->vector;