From efa91386d8b0a2270d3396a6cf1f2098487feb3d Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Wed, 4 May 2016 23:34:50 +0200
Subject: Eliminating compile warnings

---
 src/PJ_eck5.c  | 31 ++++++++-----------------------
 src/PJ_fahey.c | 19 +++++++++----------
 2 files changed, 17 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/PJ_eck5.c b/src/PJ_eck5.c
index ccfcb88f..d7626939 100644
--- a/src/PJ_eck5.c
+++ b/src/PJ_eck5.c
@@ -56,7 +56,6 @@ int pj_eck5_selftest (void) {
     double tolerance_lp = 1e-10;
     double tolerance_xy = 1e-7;
 
-    char e_args[] = {"+proj=eck5   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
     char s_args[] = {"+proj=eck5   +a=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
@@ -66,18 +65,11 @@ int pj_eck5_selftest (void) {
         {-2,-1}
     };
 
-    XY e_fwd_expect[] = {
-        { 196358.31442683787,  98186.634363414545
},
-        { 196358.31442683787, -98186.634363414545
},
-        {-196358.31442683787,  98186.634363414545
},
-        {-196358.31442683787, -98186.634363414545
},
-    };
-
     XY s_fwd_expect[] = {
-        { 197031.39213406085,  98523.198847226551
},
-        { 197031.39213406085, -98523.198847226551
},
-        {-197031.39213406085,  98523.198847226551
},
-        {-197031.39213406085, -98523.198847226551
},
+        { 197031.39213406085,  98523.198847226551},
+        { 197031.39213406085, -98523.198847226551},
+        {-197031.39213406085,  98523.198847226551},
+        {-197031.39213406085, -98523.198847226551},
     };
 
     XY inv_in[] = {
@@ -87,18 +79,11 @@ int pj_eck5_selftest (void) {
         {-200,-100}
     };
 
-    LP e_inv_expect[] = {
-        {0.0020369371178927064,  0.0010184685588659013
},
-        {0.0020369371178927064,  -0.0010184685588659013
},
-        {-0.0020369371178927064,  0.0010184685588659013
},
-        {-0.0020369371178927064,  -0.0010184685588659013
},
-    };
-
     LP s_inv_expect[] = {
-        {0.002029978749734037,  0.001014989374787388
},
-        {0.002029978749734037,  -0.001014989374787388
},
-        {-0.002029978749734037,  0.001014989374787388
},
-        {-0.002029978749734037,  -0.001014989374787388
},
+        {0.002029978749734037,  0.001014989374787388},
+        {0.002029978749734037,  -0.001014989374787388},
+        {-0.002029978749734037,  0.001014989374787388},
+        {-0.002029978749734037,  -0.001014989374787388},
     };
 
     return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect);
diff --git a/src/PJ_fahey.c b/src/PJ_fahey.c
index 864225f4..b8841c96 100644
--- a/src/PJ_fahey.c
+++ b/src/PJ_fahey.c
@@ -1,5 +1,5 @@
 #define PJ_LIB__
-# include   <projects.h>
+#include <projects.h>
 
 PROJ_HEAD(fahey, "Fahey") "\n\tPcyl, Sph.";
 
@@ -58,7 +58,6 @@ int pj_fahey_selftest (void) {
     double tolerance_lp = 1e-10;
     double tolerance_xy = 1e-7;
 
-    char e_args[] = {"+proj=fahey   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
     char s_args[] = {"+proj=fahey   +a=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
@@ -69,10 +68,10 @@ int pj_fahey_selftest (void) {
     };
 
     XY s_fwd_expect[] = {
-        { 182993.34464912376,  101603.19356988439
},
-        { 182993.34464912376, -101603.19356988439
},
-        {-182993.34464912376,  101603.19356988439
},
-        {-182993.34464912376, -101603.19356988439
},
+        { 182993.34464912376,  101603.19356988439},
+        { 182993.34464912376, -101603.19356988439},
+        {-182993.34464912376,  101603.19356988439},
+        {-182993.34464912376, -101603.19356988439},
     };
 
     XY inv_in[] = {
@@ -83,10 +82,10 @@ int pj_fahey_selftest (void) {
     };
 
     LP s_inv_expect[] = {
-        {0.0021857886080359551,  0.00098424601668238403
},
-        {0.0021857886080359551,  -0.00098424601668238403
},
-        {-0.0021857886080359551,  0.00098424601668238403
},
-        {-0.0021857886080359551,  -0.00098424601668238403
},
+        {0.0021857886080359551,  0.00098424601668238403},
+        {0.0021857886080359551,  -0.00098424601668238403},
+        {-0.0021857886080359551,  0.00098424601668238403},
+        {-0.0021857886080359551,  -0.00098424601668238403},
     };
 
     return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect);
-- 
cgit v1.2.3