From 1549178b0bf60c32f3f40a9847ad19930cee3e98 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sun, 19 Sep 2021 15:09:31 -0700 Subject: [PATCH] make_map_internal: flip order of 'bbm0' if-then-else ladder Squashes a -Wfloat-equal warning. --- cmd/gvmap/make_map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c index c7f81792c..b6a0ef645 100644 --- a/cmd/gvmap/make_map.c +++ b/cmd/gvmap/make_map.c @@ -1146,10 +1146,10 @@ static int make_map_internal(int exclude_random, int include_OK_points, real bbm1 = bounding_box_margin[1]; if (bbm0 > 0) fprintf (stderr, "bounding box margin: %.06f", bbm0); - else if (bbm0 == 0) - fprintf (stderr, "bounding box margin: %.06f", MAX(boxsize[0]*0.2, 2*shore_depth_tol)); - else + else if (bbm0 < 0) fprintf (stderr, "bounding box margin: (%.06f * %.06f)", boxsize[0], -bbm0); + else + 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) -- 2.40.0