aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/PJ_gstmerc.c4
-rw-r--r--src/PJ_hammer.c4
-rw-r--r--src/PJ_hatano.c4
-rw-r--r--src/PJ_healpix.c15
-rw-r--r--src/PJ_helmert.c6
-rw-r--r--src/PJ_hgridshift.c4
-rw-r--r--src/PJ_horner.c13
-rw-r--r--src/PJ_igh.c5
-rw-r--r--src/PJ_imw_p.c4
-rw-r--r--src/PJ_isea.c3
-rw-r--r--src/PJ_krovak.c5
-rw-r--r--src/PJ_labrd.c4
-rw-r--r--src/PJ_lagrng.c4
-rw-r--r--src/PJ_larr.c4
-rw-r--r--src/PJ_lcca.c4
-rw-r--r--src/PJ_loxim.c4
-rw-r--r--src/PJ_lsat.c4
-rw-r--r--src/PJ_mbt_fps.c4
-rw-r--r--src/PJ_mbtfpp.c4
-rw-r--r--src/PJ_mbtfpq.c4
-rw-r--r--src/PJ_merc.c5
-rw-r--r--src/PJ_mill.c4
-rw-r--r--src/PJ_misrsom.c4
-rw-r--r--src/PJ_moll.c4
-rw-r--r--src/PJ_molodensky.c4
25 files changed, 86 insertions, 38 deletions
diff --git a/src/PJ_gstmerc.c b/src/PJ_gstmerc.c
index 81ec4e17..5b5109b0 100644
--- a/src/PJ_gstmerc.c
+++ b/src/PJ_gstmerc.c
@@ -1,5 +1,8 @@
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "projects.h"
PROJ_HEAD(gstmerc, "Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion)")
@@ -67,4 +70,3 @@ PJ *PROJECTION(gstmerc) {
return P;
}
-
diff --git a/src/PJ_hammer.c b/src/PJ_hammer.c
index e7546ac0..f3e0d64e 100644
--- a/src/PJ_hammer.c
+++ b/src/PJ_hammer.c
@@ -1,5 +1,8 @@
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -70,4 +73,3 @@ PJ *PROJECTION(hammer) {
return P;
}
-
diff --git a/src/PJ_hatano.c b/src/PJ_hatano.c
index 985bf0cc..4e852888 100644
--- a/src/PJ_hatano.c
+++ b/src/PJ_hatano.c
@@ -1,4 +1,7 @@
#define PJ_LIB__
+
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -78,4 +81,3 @@ PJ *PROJECTION(hatano) {
return P;
}
-
diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c
index c3eae14f..d76ca33d 100644
--- a/src/PJ_healpix.c
+++ b/src/PJ_healpix.c
@@ -28,16 +28,18 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*****************************************************************************/
-# define PJ_LIB__
-# include <errno.h>
-# include "proj_internal.h"
-# include "proj.h"
-# include "projects.h"
+#define PJ_LIB__
+
+#include <errno.h>
+#include <math.h>
+
+#include "proj_internal.h"
+#include "proj.h"
+#include "projects.h"
PROJ_HEAD(healpix, "HEALPix") "\n\tSph., Ellps.";
PROJ_HEAD(rhealpix, "rHEALPix") "\n\tSph., Ellps.\n\tnorth_square= south_square=";
-# include <stdio.h>
/* Matrix for counterclockwise rotation by pi/2: */
# define R1 {{ 0,-1},{ 1, 0}}
/* Matrix for counterclockwise rotation by pi: */
@@ -668,4 +670,3 @@ PJ *PROJECTION(rhealpix) {
return P;
}
-
diff --git a/src/PJ_helmert.c b/src/PJ_helmert.c
index 59864136..8ba955bb 100644
--- a/src/PJ_helmert.c
+++ b/src/PJ_helmert.c
@@ -43,11 +43,14 @@ Last update: 2017-05-15
***********************************************************************/
#define PJ_LIB__
-#include <stddef.h>
+
#include <errno.h>
+#include <math.h>
+
#include "proj_internal.h"
#include "projects.h"
#include "geocent.h"
+
PROJ_HEAD(helmert, "3(6)-, 4(8)- and 7(14)-parameter Helmert shift");
static XYZ helmert_forward_3d (LPZ lpz, PJ *P);
@@ -607,4 +610,3 @@ PJ *TRANSFORMATION(helmert, 0) {
return P;
}
-
diff --git a/src/PJ_hgridshift.c b/src/PJ_hgridshift.c
index 54440822..3932ef51 100644
--- a/src/PJ_hgridshift.c
+++ b/src/PJ_hgridshift.c
@@ -1,4 +1,7 @@
#define PJ_LIB__
+
+#include <stddef.h>
+
#include "proj_internal.h"
#include "projects.h"
@@ -72,4 +75,3 @@ PJ *TRANSFORMATION(hgridshift,0) {
return P;
}
-
diff --git a/src/PJ_horner.c b/src/PJ_horner.c
index 24e1cbe9..50e13850 100644
--- a/src/PJ_horner.c
+++ b/src/PJ_horner.c
@@ -76,13 +76,17 @@
*****************************************************************************/
#define PJ_LIB__
+
+#include <errno.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+
#include "proj_internal.h"
#include "projects.h"
-#include <stddef.h>
-#include <math.h>
-#include <errno.h>
-PROJ_HEAD(horner, "Horner polynomial evaluation");
+PROJ_HEAD(horner, "Horner polynomial evaluation");
/* make horner.h interface with proj's memory management */
#define horner_dealloc(x) pj_dealloc(x)
@@ -503,4 +507,3 @@ PJ *PROJECTION(horner) {
return P;
}
-
diff --git a/src/PJ_igh.c b/src/PJ_igh.c
index bb97a8b5..23614ac5 100644
--- a/src/PJ_igh.c
+++ b/src/PJ_igh.c
@@ -1,5 +1,8 @@
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "projects.h"
PROJ_HEAD(igh, "Interrupted Goode Homolosine") "\n\tPCyl, Sph.";
@@ -220,5 +223,3 @@ PJ *PROJECTION(igh) {
return P;
}
-
-
diff --git a/src/PJ_imw_p.c b/src/PJ_imw_p.c
index c7939d3e..4c1b5e45 100644
--- a/src/PJ_imw_p.c
+++ b/src/PJ_imw_p.c
@@ -1,5 +1,8 @@
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -208,4 +211,3 @@ PJ *PROJECTION(imw_p) {
return P;
}
-
diff --git a/src/PJ_isea.c b/src/PJ_isea.c
index 53302a5c..b982d11e 100644
--- a/src/PJ_isea.c
+++ b/src/PJ_isea.c
@@ -3,10 +3,11 @@
* and is in the public domain.
*/
+#include <float.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#include <float.h>
+#include <string.h>
#ifndef M_PI
# define M_PI 3.14159265358979323846
diff --git a/src/PJ_krovak.c b/src/PJ_krovak.c
index ef00d715..9b269c88 100644
--- a/src/PJ_krovak.c
+++ b/src/PJ_krovak.c
@@ -75,9 +75,11 @@
*
*****************************************************************************/
-
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "projects.h"
PROJ_HEAD(krovak, "Krovak") "\n\tPCyl., Ellps.";
@@ -218,4 +220,3 @@ PJ *PROJECTION(krovak) {
return P;
}
-
diff --git a/src/PJ_labrd.c b/src/PJ_labrd.c
index 16c45a0d..502adf0f 100644
--- a/src/PJ_labrd.c
+++ b/src/PJ_labrd.c
@@ -1,5 +1,8 @@
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "projects.h"
PROJ_HEAD(labrd, "Laborde") "\n\tCyl, Sph\n\tSpecial for Madagascar";
@@ -127,4 +130,3 @@ PJ *PROJECTION(labrd) {
return P;
}
-
diff --git a/src/PJ_lagrng.c b/src/PJ_lagrng.c
index cf6d97d6..d2b53b09 100644
--- a/src/PJ_lagrng.c
+++ b/src/PJ_lagrng.c
@@ -1,5 +1,8 @@
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -60,4 +63,3 @@ PJ *PROJECTION(lagrng) {
return P;
}
-
diff --git a/src/PJ_larr.c b/src/PJ_larr.c
index a8d1af56..e4e39dc9 100644
--- a/src/PJ_larr.c
+++ b/src/PJ_larr.c
@@ -1,4 +1,7 @@
#define PJ_LIB__
+
+#include <math.h>
+
#include "projects.h"
PROJ_HEAD(larr, "Larrivee") "\n\tMisc Sph, no inv.";
@@ -23,4 +26,3 @@ PJ *PROJECTION(larr) {
return P;
}
-
diff --git a/src/PJ_lcca.c b/src/PJ_lcca.c
index efae5c7c..f0f256b1 100644
--- a/src/PJ_lcca.c
+++ b/src/PJ_lcca.c
@@ -46,7 +46,10 @@
*****************************************************************************/
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -157,4 +160,3 @@ PJ *PROJECTION(lcca) {
return P;
}
-
diff --git a/src/PJ_loxim.c b/src/PJ_loxim.c
index 36b05b86..512bfc23 100644
--- a/src/PJ_loxim.c
+++ b/src/PJ_loxim.c
@@ -1,5 +1,8 @@
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -70,4 +73,3 @@ PJ *PROJECTION(loxim) {
return P;
}
-
diff --git a/src/PJ_lsat.c b/src/PJ_lsat.c
index 7e1567e1..810a1cba 100644
--- a/src/PJ_lsat.c
+++ b/src/PJ_lsat.c
@@ -1,6 +1,9 @@
/* based upon Snyder and Linck, USGS-NMD */
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -205,4 +208,3 @@ PJ *PROJECTION(lsat) {
return P;
}
-
diff --git a/src/PJ_mbt_fps.c b/src/PJ_mbt_fps.c
index 2fccf3aa..b689014f 100644
--- a/src/PJ_mbt_fps.c
+++ b/src/PJ_mbt_fps.c
@@ -1,4 +1,7 @@
#define PJ_LIB__
+
+#include <math.h>
+
#include "projects.h"
PROJ_HEAD(mbt_fps, "McBryde-Thomas Flat-Pole Sine (No. 2)") "\n\tCyl., Sph.";
@@ -52,4 +55,3 @@ PJ *PROJECTION(mbt_fps) {
return P;
}
-
diff --git a/src/PJ_mbtfpp.c b/src/PJ_mbtfpp.c
index 9b90444b..5e5b2d50 100644
--- a/src/PJ_mbtfpp.c
+++ b/src/PJ_mbtfpp.c
@@ -1,4 +1,7 @@
#define PJ_LIB__
+
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -60,4 +63,3 @@ PJ *PROJECTION(mbtfpp) {
return P;
}
-
diff --git a/src/PJ_mbtfpq.c b/src/PJ_mbtfpq.c
index cff7fbdd..75c71708 100644
--- a/src/PJ_mbtfpq.c
+++ b/src/PJ_mbtfpq.c
@@ -1,4 +1,7 @@
#define PJ_LIB__
+
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -69,4 +72,3 @@ PJ *PROJECTION(mbtfpq) {
return P;
}
-
diff --git a/src/PJ_merc.c b/src/PJ_merc.c
index 9123eae1..b75f9b11 100644
--- a/src/PJ_merc.c
+++ b/src/PJ_merc.c
@@ -1,9 +1,12 @@
#define PJ_LIB__
+
+#include <float.h>
+#include <math.h>
+
#include "proj_internal.h"
#include "proj.h"
#include "proj_math.h"
#include "projects.h"
-#include <float.h>
PROJ_HEAD(merc, "Mercator") "\n\tCyl, Sph&Ell\n\tlat_ts=";
PROJ_HEAD(webmerc, "Web Mercator / Pseudo Mercator") "\n\tCyl, Sph\n\t";
diff --git a/src/PJ_mill.c b/src/PJ_mill.c
index fdb0b2ad..3ea9636f 100644
--- a/src/PJ_mill.c
+++ b/src/PJ_mill.c
@@ -1,4 +1,7 @@
#define PJ_LIB__
+
+#include <math.h>
+
#include "projects.h"
PROJ_HEAD(mill, "Miller Cylindrical") "\n\tCyl, Sph";
@@ -32,4 +35,3 @@ PJ *PROJECTION(mill) {
return P;
}
-
diff --git a/src/PJ_misrsom.c b/src/PJ_misrsom.c
index b9b97117..0308fc42 100644
--- a/src/PJ_misrsom.c
+++ b/src/PJ_misrsom.c
@@ -21,7 +21,10 @@
*****************************************************************************/
/* based upon Snyder and Linck, USGS-NMD */
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "proj.h"
#include "projects.h"
@@ -212,4 +215,3 @@ PJ *PROJECTION(misrsom) {
return P;
}
-
diff --git a/src/PJ_moll.c b/src/PJ_moll.c
index 66e6315a..7c0e6f85 100644
--- a/src/PJ_moll.c
+++ b/src/PJ_moll.c
@@ -1,5 +1,8 @@
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "projects.h"
PROJ_HEAD(moll, "Mollweide") "\n\tPCyl., Sph.";
@@ -105,4 +108,3 @@ PJ *PROJECTION(wag5) {
return P;
}
-
diff --git a/src/PJ_molodensky.c b/src/PJ_molodensky.c
index 92969d67..2db51038 100644
--- a/src/PJ_molodensky.c
+++ b/src/PJ_molodensky.c
@@ -43,7 +43,10 @@
*
***********************************************************************/
#define PJ_LIB__
+
#include <errno.h>
+#include <math.h>
+
#include "proj.h"
#include "proj_internal.h"
#include "projects.h"
@@ -311,4 +314,3 @@ PJ *TRANSFORMATION(molodensky,1) {
return P;
}
-