From 095d2204f8bb05d172936aebbb1e9e44852c049f Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Fri, 29 Mar 2019 19:17:37 +0000 Subject: Remove duplicate instances of #include "proj_internal.h" Introduced by "Merge projects.h into proj_internal.h" 8ab6f683. --- src/projections/bertin1953.cpp | 1 - src/projections/healpix.cpp | 1 - src/projections/isea.cpp | 3 +-- src/projections/latlong.cpp | 1 - src/projections/merc.cpp | 3 +-- src/projections/ortho.cpp | 1 - src/projections/robin.cpp | 3 +-- src/projections/tobmerc.cpp | 3 +-- 8 files changed, 4 insertions(+), 12 deletions(-) (limited to 'src/projections') diff --git a/src/projections/bertin1953.cpp b/src/projections/bertin1953.cpp index 96de6d4b..add9f0b3 100644 --- a/src/projections/bertin1953.cpp +++ b/src/projections/bertin1953.cpp @@ -14,7 +14,6 @@ #include #include -#include "proj_internal.h" #include "proj.h" #include "proj_internal.h" diff --git a/src/projections/healpix.cpp b/src/projections/healpix.cpp index 8e4846ed..e9924e04 100644 --- a/src/projections/healpix.cpp +++ b/src/projections/healpix.cpp @@ -33,7 +33,6 @@ #include #include -#include "proj_internal.h" #include "proj.h" #include "proj_internal.h" diff --git a/src/projections/isea.cpp b/src/projections/isea.cpp index 18b1cf55..28510cb0 100644 --- a/src/projections/isea.cpp +++ b/src/projections/isea.cpp @@ -13,10 +13,9 @@ #include #define PJ_LIB__ -#include "proj_internal.h" -#include "proj_math.h" #include "proj.h" #include "proj_internal.h" +#include "proj_math.h" #define DEG36 0.62831853071795864768 #define DEG72 1.25663706143591729537 diff --git a/src/projections/latlong.cpp b/src/projections/latlong.cpp index 970c4893..2c98a4cd 100644 --- a/src/projections/latlong.cpp +++ b/src/projections/latlong.cpp @@ -30,7 +30,6 @@ /* very loosely based upon DMA code by Bradford W. Drew */ #define PJ_LIB__ #include "proj_internal.h" -#include "proj_internal.h" PROJ_HEAD(lonlat, "Lat/long (Geodetic)") "\n\t"; PROJ_HEAD(latlon, "Lat/long (Geodetic alias)") "\n\t"; diff --git a/src/projections/merc.cpp b/src/projections/merc.cpp index 5b65de90..4975b6c5 100644 --- a/src/projections/merc.cpp +++ b/src/projections/merc.cpp @@ -3,10 +3,9 @@ #include #include -#include "proj_internal.h" #include "proj.h" -#include "proj_math.h" #include "proj_internal.h" +#include "proj_math.h" PROJ_HEAD(merc, "Mercator") "\n\tCyl, Sph&Ell\n\tlat_ts="; PROJ_HEAD(webmerc, "Web Mercator / Pseudo Mercator") "\n\tCyl, Ell\n\t"; diff --git a/src/projections/ortho.cpp b/src/projections/ortho.cpp index d4300bd5..eda325fe 100644 --- a/src/projections/ortho.cpp +++ b/src/projections/ortho.cpp @@ -3,7 +3,6 @@ #include "proj.h" #include "proj_internal.h" #include "proj_math.h" -#include "proj_internal.h" PROJ_HEAD(ortho, "Orthographic") "\n\tAzi, Sph"; diff --git a/src/projections/robin.cpp b/src/projections/robin.cpp index 9f7908f6..dfb750dd 100644 --- a/src/projections/robin.cpp +++ b/src/projections/robin.cpp @@ -1,8 +1,7 @@ #define PJ_LIB__ -#include "proj_math.h" -#include "proj_internal.h" #include "proj.h" #include "proj_internal.h" +#include "proj_math.h" PROJ_HEAD(robin, "Robinson") "\n\tPCyl, Sph"; diff --git a/src/projections/tobmerc.cpp b/src/projections/tobmerc.cpp index 95960097..126d6be2 100644 --- a/src/projections/tobmerc.cpp +++ b/src/projections/tobmerc.cpp @@ -3,10 +3,9 @@ #include #include -#include "proj_internal.h" #include "proj.h" -#include "proj_math.h" #include "proj_internal.h" +#include "proj_math.h" PROJ_HEAD(tobmerc, "Tobler-Mercator") "\n\tCyl, Sph"; -- cgit v1.2.3