patchwork: replace 'rectangle_new' with C99 initialization

diff --git a/lib/patchwork/patchwork.c b/lib/patchwork/patchwork.c
index 22e2c6d1e1984d9c22d5e30cba49a05f2b8e4570..48f93376d7cdb4e0fe2f2cdae2206fa220827cee 100644 (file)
--- a/lib/patchwork/patchwork.c
+++ b/lib/patchwork/patchwork.c
@@ -280,7 +280,7 @@ void patchworkLayout(Agraph_t * g)
 
     root = mkTree (g,gp,ap,mp);
     total = root->area;
-    root->r = rectangle_new(0, 0, sqrt(total + 0.1), sqrt(total + 0.1));
+    root->r = (rectangle){{0, 0}, {sqrt(total + 0.1), sqrt(total + 0.1)}};
     layoutTree(root);
     walkTree(root);
     freeTree (root);

diff --git a/lib/patchwork/tree_map.c b/lib/patchwork/tree_map.c
index 561b639b57cb5edb937e091cf64cc9fcde09efe0..9be723d4e5fdb61f335dc3422ba33b04b2ec2ee1 100644 (file)
--- a/lib/patchwork/tree_map.c
+++ b/lib/patchwork/tree_map.c
@@ -111,15 +111,3 @@ rectangle* tree_map(int n, double *area, rectangle fillrec){
   squarify(n, area, recs, nadded, maxarea, minarea, totalarea, asp, fillrec);
   return recs;
 }
-
-/* rectangle_new:
- * Create and initialize a new rectangle structure
- */
-rectangle rectangle_new(double x, double y, double width, double height){
-  rectangle r;
-  r.x[0] = x;
-  r.x[1] = y;
-  r.size[0] = width;
-  r.size[1] = height;
-  return r;
-}

diff --git a/lib/patchwork/tree_map.h b/lib/patchwork/tree_map.h
index e2570db6431fcd8ea9e168e4504d49853946e8ba..bc4f35b44011318534ca53625b24a61eb3e63dfb 100644 (file)
--- a/lib/patchwork/tree_map.h
+++ b/lib/patchwork/tree_map.h
@@ -18,5 +18,3 @@ typedef struct {
 } rectangle;
 
 extern rectangle* tree_map(int n, double *area, rectangle fillrec);
-
-extern rectangle rectangle_new(double x, double y, double width, double height);