From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 6 Jun 2021 02:33:46 +0000 (-0700)
Subject: use a stronger return type in directVis
X-Git-Tag: 2.47.3~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=863a739a3d6685d7da07239401066704c00227d8;p=graphviz

use a stronger return type in directVis
---

diff --git a/lib/pathplan/vis.h b/lib/pathplan/vis.h
index f637dcf27..13c5546b2 100644
--- a/lib/pathplan/vis.h
+++ b/lib/pathplan/vis.h
@@ -12,6 +12,7 @@
 
 #include <assert.h>
 #include <math.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <limits.h>
 #include "vispath.h"
@@ -45,7 +46,7 @@ extern "C" {
 /*end visual studio*/
 
 	extern COORD *ptVis(vconfig_t *, int, Ppoint_t);
-    extern int directVis(Ppoint_t, int, Ppoint_t, int, vconfig_t *);
+    extern bool directVis(Ppoint_t, int, Ppoint_t, int, vconfig_t *);
     extern void visibility(vconfig_t *);
     extern int *makePath(Ppoint_t p, int pp, COORD * pvis,
 			 Ppoint_t q, int qp, COORD * qvis,
diff --git a/lib/pathplan/visibility.c b/lib/pathplan/visibility.c
index 896b77e4c..bbe54da94 100644
--- a/lib/pathplan/visibility.c
+++ b/lib/pathplan/visibility.c
@@ -358,7 +358,7 @@ COORD *ptVis(vconfig_t * conf, int pp, Ppoint_t p)
  * If a point is associated with a polygon, the edges of the polygon
  * are ignored when checking visibility.
  */
-int directVis(Ppoint_t p, int pp, Ppoint_t q, int qp, vconfig_t * conf)
+bool directVis(Ppoint_t p, int pp, Ppoint_t q, int qp, vconfig_t * conf)
 {
     int V = conf->N;
     Ppoint_t *pts = conf->P;
@@ -396,15 +396,15 @@ int directVis(Ppoint_t p, int pp, Ppoint_t q, int qp, vconfig_t * conf)
 
     for (k = 0; k < s1; k++) {
 	if (INTERSECT(p, q, pts[k], pts[nextPt[k]], pts[prevPt[k]]))
-	    return 0;
+	    return false;
     }
     for (k = e1; k < s2; k++) {
 	if (INTERSECT(p, q, pts[k], pts[nextPt[k]], pts[prevPt[k]]))
-	    return 0;
+	    return false;
     }
     for (k = e2; k < V; k++) {
 	if (INTERSECT(p, q, pts[k], pts[nextPt[k]], pts[prevPt[k]]))
-	    return 0;
+	    return false;
     }
-    return 1;
+    return true;
 }