Fix and simplify ortho code

diff --git a/lib/ortho/ortho.c b/lib/ortho/ortho.c
index 97d29f440b12de54cc2d1a91cf1c11798174f933..5ba1ca8a1e139cae89fad5ff1d13259baf6a295e 100644 (file)
--- a/lib/ortho/ortho.c
+++ b/lib/ortho/ortho.c
@@ -1197,7 +1197,7 @@ attachOrthoEdges (Agraph_t* g, maze* mp, int n_edges, route* route_list, splineI
        }
        ispline[ipt] = ispline[ipt+1] = p;
        if (Verbose > 1)
-               fprintf(stderr, "ortho %s %s\n", agnameof(agtail(e)),agnameof(aghead(e)));
+           fprintf(stderr, "ortho %s %s\n", agnameof(agtail(e)),agnameof(aghead(e)));
        clip_and_install(e, aghead(e), ispline, npts, sinfo);
        if (doLbls && (lbl = ED_label(e)) && !lbl->set)
            addEdgeLabels(g, e, p1, q1);

diff --git a/lib/ortho/ortho.h b/lib/ortho/ortho.h
index 6c90573c82cdfa4508344a313b9b6d9f5f4784eb..eed1e7172794f233098fb0afc5194209e776980d 100644 (file)
--- a/lib/ortho/ortho.h
+++ b/lib/ortho/ortho.h
@@ -19,4 +19,4 @@
 #include <render.h>
 
 void orthoEdges (Agraph_t* g, int useLbls);
-#endif
\ No newline at end of file
+#endif

diff --git a/lib/ortho/partition.c b/lib/ortho/partition.c
index 36d6271062ec9cda55b39ff1259d9315585de441..5f8996d341be20f1f4651a6f98199405bddac2b7 100644 (file)
--- a/lib/ortho/partition.c
+++ b/lib/ortho/partition.c
@@ -50,9 +50,6 @@
 extern double drand48(void);
 #endif
 
-
-
-
 typedef struct {
   int vnum;
   int next;         /* Circularly linked list  */
@@ -162,8 +159,7 @@ generateRandomOrdering(int n, int* permute)
     for (i = 0; i <= n; i++) permute[i] = i;
 
     for (i = 1; i <= n; i++) {
-       double tempa=drand48();
-       j = i + tempa * (n + 1 - i);
+       j = i + drand48() * (n + 1 - i);
        if (j != i) {
            tmp = permute[i];
            permute [i] = permute[j];

diff --git a/lib/ortho/trapezoid.c b/lib/ortho/trapezoid.c
index 7412df04a082190474406fd38d3a6afb690a6462..b56a7ab17edec99112c7c9dec9913b403df0f032 100644 (file)
--- a/lib/ortho/trapezoid.c
+++ b/lib/ortho/trapezoid.c
@@ -29,6 +29,10 @@
 #include <memory.h>
 #include <trap.h>
 
+#ifdef WIN32
+#define log2(x)  (log(x)/log(2))
+#endif
+
 /* Node types */
 
 #define T_X     1
@@ -1023,12 +1027,7 @@ static int math_logstar_n(int n)
   double v;
 
   for (i = 0, v = (double) n; v >= 1; i++)
-#ifndef WIN32
       v = log2(v);
-#else
-      v = log(v)/log(2);
-
-#endif
 
   return (i - 1);
 }
@@ -1039,13 +1038,7 @@ static int math_N(int n, int h)
   double v;
 
   for (i = 0, v = (int) n; i < h; i++)
-#ifndef WIN32
       v = log2(v);
-#else
-      v = log(v)/log(2);
-
-#endif
-
 
   return (int) ceil((double) 1.0*n/v);
 }