pack arrayRects: use cgraph wrappers for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.

diff --git a/lib/pack/pack.c b/lib/pack/pack.c
index b1cc17756d8ef3adee3061df9068b8e21fbfc7f6..fc0c6a6e76947360187809573bfe1c250506c3e8 100644 (file)
--- a/lib/pack/pack.c
+++ b/lib/pack/pack.c
@@ -608,12 +608,8 @@ arrayRects (int ng, boxf* gs, pack_info* pinfo)
     int nr = 0, nc;
     int r, c;
     ainfo *info;
-    ainfo *ip;
-    ainfo **sinfo;
-    double* widths;
-    double* heights;
     double v, wd, ht;
-    point* places = N_NEW(ng, point);
+    point *places = gv_calloc(ng, sizeof(point));
     boxf bb;
     int sz, rowMajor;
 
@@ -643,10 +639,10 @@ arrayRects (int ng, boxf* gs, pack_info* pinfo)
     }
     if (Verbose)
        fprintf (stderr, "array packing: %s %d rows %d columns\n", (rowMajor?"row major":"column major"), nr, nc);
-    widths = N_NEW(nc+1, double);
-    heights = N_NEW(nr+1, double);
+    double *widths = gv_calloc(nc + 1, sizeof(double));
+    double *heights = gv_calloc(nr + 1, sizeof(double));
 
-    ip = info = N_NEW(ng, ainfo);
+    ainfo *ip = info = gv_calloc(ng, sizeof(ainfo));
     for (i = 0; i < ng; i++, ip++) {
        bb = gs[i];
        ip->width = bb.UR.x - bb.LL.x + pinfo->margin;
@@ -654,7 +650,7 @@ arrayRects (int ng, boxf* gs, pack_info* pinfo)
        ip->index = i;
     }
 
-    sinfo = N_NEW(ng, ainfo*);
+    ainfo **sinfo = gv_calloc(ng, sizeof(ainfo*));
     for (i = 0; i < ng; i++) {
        sinfo[i] = info + i;
     }