Converted gall. Expanded tabs.

2 files changed, 96 insertions, 18 deletions

diff --git a/src/PJ_aea.c b/src/PJ_aea.c
index fd697f14..c20a0bef 100644
--- a/src/PJ_aea.c
+++ b/src/PJ_aea.c
@@ -359,7 +359,6 @@ int pj_eck6_selftest     (void)     {return 10000;}
 int pj_eqc_selftest (void) {return 10000;}
 int pj_eqdc_selftest (void) {return 10000;}
 int pj_etmerc_selftest (void) {return 10000;}
-int pj_gall_selftest (void) {return 10000;}
 int pj_geos_selftest (void) {return 10000;}
 int pj_geocent_selftest (void) {return 10000;}
 int pj_gins8_selftest (void) {return 10000;}
diff --git a/src/PJ_gall.c b/src/PJ_gall.c
index 1acd7d09..b3d7cc6c 100644
--- a/src/PJ_gall.c
+++ b/src/PJ_gall.c
@@ -1,21 +1,100 @@
 #define PJ_LIB__
-#include	<projects.h>
+#include <projects.h>
+
 PROJ_HEAD(gall, "Gall (Gall Stereographic)") "\n\tCyl, Sph";
-#define YF	1.70710678118654752440
-#define XF	0.70710678118654752440
-#define RYF	0.58578643762690495119
-#define RXF	1.41421356237309504880
-FORWARD(s_forward); /* spheroid */
-	(void) P;
-	xy.x = XF * lp.lam;
-	xy.y = YF * tan(.5 * lp.phi);
-	return (xy);
+
+#define YF  1.70710678118654752440
+#define XF  0.70710678118654752440
+#define RYF 0.58578643762690495119
+#define RXF 1.41421356237309504880
+
+
+static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
+    XY xy = {0.0,0.0};
+    (void) P;
+
+    xy.x = XF * lp.lam;
+    xy.y = YF * tan(.5 * lp.phi);
+
+    return xy;
 }
-INVERSE(s_inverse); /* spheroid */
-	(void) P;
-	lp.lam = RXF * xy.x;
-	lp.phi = 2. * atan(xy.y * RYF);
-	return (lp);
+
+
+static LP s_inverse (XY xy, PJ *P) {           /* Spheroidal, inverse */
+    LP lp = {0.0,0.0};
+    (void) P;
+
+    lp.lam = RXF * xy.x;
+    lp.phi = 2. * atan(xy.y * RYF);
+
+    return lp;
 }
-FREEUP; if (P) pj_dalloc(P); }
-ENTRY0(gall) P->es = 0.; P->inv = s_inverse; P->fwd = s_forward; ENDENTRY(P)
+
+
+static void *freeup_new (PJ *P) {              /* Destructor */
+    if (0==P)
+        return 0;
+
+    return pj_dealloc(P);
+}
+
+
+static void freeup (PJ *P) {
+    freeup_new (P);
+    return;
+}
+
+
+PJ *PROJECTION(gall) {
+    P->es = 0.0;
+
+    P->inv = s_inverse;
+    P->fwd = s_forward;
+
+    return P;
+}
+
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_gall_selftest (void) {return 0;}
+#else
+
+int pj_gall_selftest (void) {
+    double tolerance_lp = 1e-10;
+    double tolerance_xy = 1e-7;
+
+    char s_args[] = {"+proj=gall   +a=6400000    +lat_1=0.5 +lat_2=2"};
+
+    LP fwd_in[] = {
+        { 2, 1},
+        { 2,-1},
+        {-2, 1},
+        {-2,-1}
+    };
+
+    XY s_fwd_expect[] = {
+        { 157969.17113451968,  95345.249178385886},
+        { 157969.17113451968, -95345.249178385886},
+        {-157969.17113451968,  95345.249178385886},
+        {-157969.17113451968, -95345.249178385886},
+    };
+
+    XY inv_in[] = {
+        { 200, 100},
+        { 200,-100},
+        {-200, 100},
+        {-200,-100}
+    };
+
+    LP s_inv_expect[] = {
+        { 0.0025321396391918614,  0.001048846580346495},
+        { 0.0025321396391918614, -0.001048846580346495},
+        {-0.0025321396391918614,  0.001048846580346495},
+        {-0.0025321396391918614, -0.001048846580346495},
+    };
+
+    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);
+}
+
+
+#endif