Merge 74d082a into 03011fb

OSGeo · May 14, 2018 · d2d47f0 · d2d47f0
2 parents 03011fb + 74d082a
commit d2d47f0
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 34 deletions.
diff --git a/src/PJ_axisswap.c b/src/PJ_axisswap.c
@@ -54,6 +54,9 @@ It is only necessary to specify the axes that are affected by the swap
 
 #define PJ_LIB__
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "proj_internal.h"
 #include "projects.h"
 

diff --git a/src/PJ_bacon.c b/src/PJ_bacon.c
@@ -1,8 +1,10 @@
 # define HLFPI2	2.46740110027233965467      /* (pi/2)^2 */
 # define EPS	1e-10
 #define PJ_LIB__
-#include	<errno.h>
-#include	"projects.h"
+#include <errno.h>
+#include <math.h>
+
+#include "projects.h"
 
 
 struct pj_opaque {
@@ -75,5 +77,3 @@ PJ *PROJECTION(ortel) {
     P->fwd = s_forward;
     return P;
 }
-
-
diff --git a/src/PJ_bipc.c b/src/PJ_bipc.c
@@ -1,6 +1,8 @@
 #define PJ_LIB__
-#include "proj.h"
 #include <errno.h>
+#include <math.h>
+
+#include "proj.h"
 #include "projects.h"
 #include "proj_math.h"
 
@@ -170,5 +172,3 @@ PJ *PROJECTION(bipc) {
     P->es = 0.;
     return P;
 }
-
-
diff --git a/src/PJ_boggs.c b/src/PJ_boggs.c
@@ -1,6 +1,8 @@
 #define PJ_LIB__
-# include	<errno.h>
-# include	"projects.h"
+#include <math.h>
+
+#include "projects.h"
+
 PROJ_HEAD(boggs, "Boggs Eumorphic") "\n\tPCyl., no inv., Sph.";
 # define NITER	20
 # define EPS	1e-7
@@ -39,5 +41,3 @@ PJ *PROJECTION(boggs) {
     P->fwd = s_forward;
     return P;
 }
-
-
diff --git a/src/PJ_calcofi.c b/src/PJ_calcofi.c
@@ -1,15 +1,14 @@
 #define PJ_LIB__
+
+#include <math.h>
+
 #include "proj.h"
 #include "projects.h"
+#include "proj_api.h"
 
 PROJ_HEAD(calcofi,
     "Cal Coop Ocean Fish Invest Lines/Stations") "\n\tCyl, Sph&Ell";
 
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-#include "proj_api.h"
-#include <errno.h>
 
 /* Conversions for the California Cooperative Oceanic Fisheries Investigations
 Line/Station coordinate system following the algorithm of:
@@ -162,5 +161,3 @@ PJ *PROJECTION(calcofi) {
     }
     return P;
 }
-
-
diff --git a/src/PJ_cart.c b/src/PJ_cart.c
@@ -41,11 +41,11 @@
  *****************************************************************************/
 
 #define PJ_LIB__
+
 #include "proj_internal.h"
 #include "projects.h"
 #include "proj_math.h"
-#include <stddef.h>
-#include <errno.h>
+
 PROJ_HEAD(cart,    "Geodetic/cartesian conversions");
 
 

diff --git a/src/PJ_cass.c b/src/PJ_cass.c
@@ -1,6 +1,10 @@
 #define PJ_LIB__
-# include   <errno.h>
-# include   "projects.h"
+
+#include <errno.h>
+#include <math.h>
+
+#include "projects.h"
+
 PROJ_HEAD(cass, "Cassini") "\n\tCyl, Sph&Ell";
 
 
@@ -115,5 +119,3 @@ PJ *PROJECTION(cass) {
 
     return P;
 }
-
-
diff --git a/src/PJ_cc.c b/src/PJ_cc.c
@@ -1,4 +1,7 @@
 #define PJ_LIB__
+
+#include <math.h>
+
 #include "proj.h"
 #include "projects.h"
 
@@ -36,5 +39,3 @@ PJ *PROJECTION(cc) {
 
     return P;
 }
-
-
diff --git a/src/PJ_cea.c b/src/PJ_cea.c
@@ -1,5 +1,8 @@
 #define PJ_LIB__
+
 #include <errno.h>
+#include <math.h>
+
 #include "proj.h"
 #include "projects.h"
 
@@ -96,5 +99,3 @@ PJ *PROJECTION(cea) {
 
     return P;
 }
-
-
diff --git a/src/PJ_chamb.c b/src/PJ_chamb.c
@@ -1,5 +1,8 @@
 #define PJ_LIB__
+
 #include <errno.h>
+#include <math.h>
+
 #include "proj.h"
 #include "projects.h"
 
@@ -134,5 +137,3 @@ PJ *PROJECTION(chamb) {
 
     return P;
 }
-
-
diff --git a/src/PJ_collg.c b/src/PJ_collg.c
@@ -1,4 +1,7 @@
 #define PJ_LIB__
+
+#include <math.h>
+
 #include "proj.h"
 #include "projects.h"
 
@@ -48,4 +51,3 @@ PJ *PROJECTION(collg) {
 
     return P;
 }
-
diff --git a/src/PJ_comill.c b/src/PJ_comill.c
@@ -7,7 +7,10 @@ Port to PROJ.4 by Bojan Savric, 4 April 2016
 */
 
 #define PJ_LIB__
-#include    "projects.h"
+
+#include <math.h>
+
+#include "projects.h"
 
 PROJ_HEAD(comill, "Compact Miller") "\n\tCyl., Sph.";
 
@@ -79,5 +82,3 @@ PJ *PROJECTION(comill) {
 
     return P;
 }
-
-