From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 30 Jul 2022 00:24:05 +0000 (-0700)
Subject: neatogen addTriEdge: remove unused 'd' parameter
X-Git-Tag: 5.0.1~22^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71d70322e575cedf69d776d3d469cb129c0a67b3;p=graphviz

neatogen addTriEdge: remove unused 'd' parameter

This function was ignoring the parameter and calculating the edge distance
itself internally.
---

diff --git a/lib/neatogen/multispline.c b/lib/neatogen/multispline.c
index f8cfcaa65..bccfbb181 100644
--- a/lib/neatogen/multispline.c
+++ b/lib/neatogen/multispline.c
@@ -538,11 +538,10 @@ static ipair sharedEdge(int *p, int *q)
 }
 
 /* addTriEdge:
- * Add an edge to g, with tail t, head h, distance d, and shared
+ * Add an edge to g, with tail t, head h, and shared
  * segment seg.
  */
-static void addTriEdge(tgraph * g, int t, int h, double d, ipair seg)
-{
+static void addTriEdge(tgraph *g, int t, int h, ipair seg) {
     tedge *ep = g->edges + g->nedges;
     tnode *tp = g->nodes + t;
     tnode *hp = g->nodes + h;
@@ -616,10 +615,9 @@ static tgraph *mkTriGraph(surface_t * sf, int maxv, pointf * pts)
         ne = 0;
 	while ((ne < 3) && ((j = *jp++) != -1)) {
 	    if (i < j) {
-		double dist = DIST(np->ctr, (g->nodes + j)->ctr);
 		ipair seg =
 		    sharedEdge(sf->faces + 3 * i, sf->faces + 3 * j);
-		addTriEdge(g, i, j, dist, seg);
+		addTriEdge(g, i, j, seg);
 	    }
 	    ne++;
 	}
@@ -942,7 +940,6 @@ static void addEndpoint(router_t * rtr, pointf p, node_t* v, int v_id, int sides
     int endi = rtr->obs[obs_id + 1];
     pointf* pts = rtr->ps;
     int i, t;
-    double d;
     pointf vr, v0, v1;
 
     switch (sides) {
@@ -1005,8 +1002,7 @@ static void addEndpoint(router_t * rtr, pointf p, node_t* v, int v_id, int sides
 	t = findMap(rtr->trimap, seg.i, seg.j);
 	if (sides && !inCone (v0, p, v1, pts[seg.i]) && !inCone (v0, p, v1, pts[seg.j]) && !raySeg(p,vr,pts[seg.i],pts[seg.j]))
 	    continue;
-	d = DIST(p, (rtr->tg->nodes + t)->ctr);
-	addTriEdge(rtr->tg, v_id, t, d, seg);
+	addTriEdge(rtr->tg, v_id, t, seg);
     }
 }