diff options
| author | Aaron Puchert <aaron.puchert@sap.com> | 2018-01-09 20:32:08 +0100 |
|---|---|---|
| committer | Aaron Puchert <aaron.puchert@sap.com> | 2018-01-09 20:32:08 +0100 |
| commit | f7a1fe14454b091eecb5fd3e33ff73796a726da1 (patch) | |
| tree | b3d9db4f7072429774ce55f68a033b7ae16fad96 /src/PJ_isea.c | |
| parent | 47953f0a93cd90d0d52b74f2b2705516f018b2f1 (diff) | |
| download | PROJ-f7a1fe14454b091eecb5fd3e33ff73796a726da1.tar.gz PROJ-f7a1fe14454b091eecb5fd3e33ff73796a726da1.zip | |
Remove or use unused macros
Some macros seemed to be leftover from earlier code, so I removed them.
Others seemed like they should have been used, but weren't.
There should be no functional change, except the following: in floating-
point arithmetic, x / y is not the same as x * (1.0 / y). It can be
argued that using the multiplication is significantly faster, and the
algorithm is approximative anyway. Otherwise, the constants are
obviously not required.
Also fixes one location in PJ_aitoff.c, where an enumeration value
should have been used.
Diffstat (limited to 'src/PJ_isea.c')
| -rw-r--r-- | src/PJ_isea.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/PJ_isea.c b/src/PJ_isea.c index 9baea8b5..5cc71c08 100644 --- a/src/PJ_isea.c +++ b/src/PJ_isea.c @@ -170,10 +170,6 @@ struct snyder_constants constants[] = { {37.37736814, 36.0, 30.0, 17.27, 1.163, 0.860, 13.14, 1.584, 1.0}, }; -#define E 52.62263186 -#define F 10.81231696 - -#define DEG60 1.04719755119659774614 #define DEG120 2.09439510239319549229 #define DEG72 1.25663706143591729537 #define DEG90 1.57079632679489661922 @@ -266,14 +262,12 @@ az_adjustment(int triangle) /* H = 0.25 R tan g = */ #define TABLE_H 0.1909830056 -#define RPRIME 0.91038328153090290025 - ISEA_STATIC struct isea_pt isea_triangle_xy(int triangle) { struct isea_pt c; - double Rprime = 0.91038328153090290025; + const double Rprime = 0.91038328153090290025; triangle = (triangle - 1) % 20; @@ -509,8 +503,6 @@ isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) * in original coordinate system, this function return the new coordinates. */ -#define PRECISION 0.0000000000005 - /* formula from Snyder, Map Projections: A working manual, p31 */ /* * old north pole at np in new coordinates |