From b86314c7f3b8aea961d380dbb836087b3990d7af Mon Sep 17 00:00:00 2001 From: nilason Date: Thu, 6 May 2021 22:27:48 +0200 Subject: [PATCH] v.hull: use standard C boolean type Fixes #1563 --- vector/v.hull/chull.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c index 1ad97396fa..41b627c50f 100644 --- a/vector/v.hull/chull.c +++ b/vector/v.hull/chull.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -29,10 +30,6 @@ #include "globals.h" -/*Define Boolean type */ -typedef enum -{ BFALSE, BTRUE } bool; - /* Define vertex indices. */ #define X 0 #define Y 1 @@ -76,10 +73,10 @@ struct tFaceStructure }; /* Define flags */ -#define ONHULL BTRUE -#define REMOVED BTRUE -#define VISIBLE BTRUE -#define PROCESSED BTRUE +#define ONHULL true +#define REMOVED true +#define VISIBLE true +#define PROCESSED true /* Global variable definitions */ tVertex vertices = NULL; @@ -436,7 +433,7 @@ bool AddOne(tVertex p) tFace f; tEdge e, temp; long int vol; - bool vis = BFALSE; + bool vis = false; /* Mark faces visible from p. */ @@ -446,7 +443,7 @@ bool AddOne(tVertex p) if (vol < 0) { f->visible = VISIBLE; - vis = BTRUE; + vis = true; } f = f->next; } while (f != faces); @@ -454,7 +451,7 @@ bool AddOne(tVertex p) /* If no faces are visible from p, then p is inside the hull. */ if (!vis) { p->onhull = !ONHULL; - return BFALSE; + return false; } /* Mark edges in interior of visible region for deletion. @@ -470,7 +467,7 @@ bool AddOne(tVertex p) e->newface = MakeConeFace(e, p); e = temp; } while (e != edges); - return BTRUE; + return true; } /*---------------------------------------------------------------------