aboutsummaryrefslogtreecommitdiff
path: root/src/PJ_nsper.c
diff options
context:
space:
mode:
authorAaron Puchert <aaron.puchert@sap.com>2017-11-06 17:52:29 +0100
committerAaron Puchert <aaron.puchert@sap.com>2017-11-06 18:04:54 +0100
commitc0c95e33abf2f724e5827cbf41ede41e2939e188 (patch)
treee14c3a6ce8322d3185670ce51d7a376152c25678 /src/PJ_nsper.c
parente7e86d14f86eb66365d6aa725c5e9b496b3ba7f7 (diff)
downloadPROJ-c0c95e33abf2f724e5827cbf41ede41e2939e188.tar.gz
PROJ-c0c95e33abf2f724e5827cbf41ede41e2939e188.zip
Use enumerations where appropriate
Enumerations have the following advantages over #define: - they clearly connect a variable and the allowed constants, - the meaning of code is not obfuscated by integer values, - they are visible to the compiler, which can warn about (possibly) incorrect usage. There should be no functional change.
Diffstat (limited to 'src/PJ_nsper.c')
-rw-r--r--src/PJ_nsper.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/PJ_nsper.c b/src/PJ_nsper.c
index 4975bb17..6c8ef74a 100644
--- a/src/PJ_nsper.c
+++ b/src/PJ_nsper.c
@@ -3,6 +3,13 @@
#include <proj.h>
#include "projects.h"
+enum Mode {
+ N_POLE = 0,
+ S_POLE = 1,
+ EQUIT = 2,
+ OBLIQ = 3
+};
+
struct pj_opaque {
double height;
double sinph0;
@@ -16,7 +23,7 @@ struct pj_opaque {
double sg;
double sw;
double cw;
- int mode;
+ enum Mode mode;
int tilt;
};
@@ -24,10 +31,6 @@ PROJ_HEAD(nsper, "Near-sided perspective") "\n\tAzi, Sph\n\th=";
PROJ_HEAD(tpers, "Tilted perspective") "\n\tAzi, Sph\n\ttilt= azi= h=";
# define EPS10 1.e-10
-# define N_POLE 0
-# define S_POLE 1
-# define EQUIT 2
-# define OBLIQ 3
static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */