From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 19 Sep 2021 22:17:48 +0000 (-0700)
Subject: make_map_internal: flip order of 'bbm1' if-then-else ladder
X-Git-Tag: 2.49.2~44^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ee422ec3663de03d589db55d36fdc5a8fe861f2;p=graphviz

make_map_internal: flip order of 'bbm1' if-then-else ladder

Squashes a -Wfloat-equal warning.
---

diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c
index b6a0ef645..83a231843 100644
--- a/cmd/gvmap/make_map.c
+++ b/cmd/gvmap/make_map.c
@@ -1152,10 +1152,10 @@ static int make_map_internal(int exclude_random, int include_OK_points,
 	fprintf (stderr, "bounding box margin: %.06f", MAX(boxsize[0]*0.2, 2*shore_depth_tol));
       if (bbm1 > 0)
 	fprintf (stderr, " %.06f\n", bbm1);
-      else if (bbm1 == 0)
-	fprintf (stderr, " %.06f\n", MAX(boxsize[1]*0.2, 2*shore_depth_tol));
-      else 
+      else if (bbm1 < 0)
 	fprintf (stderr, " (%.06f * %.06f)\n", boxsize[1], -bbm1);
+      else
+	fprintf (stderr, " %.06f\n", MAX(boxsize[1]*0.2, 2*shore_depth_tol));
     }
     if (*nrandom < 0) {
       real n1, n2, area2;