diff options
| author | Chris Mayo <aklhfex@gmail.com> | 2019-03-29 19:17:37 +0000 |
|---|---|---|
| committer | Chris Mayo <aklhfex@gmail.com> | 2019-03-29 19:17:37 +0000 |
| commit | 095d2204f8bb05d172936aebbb1e9e44852c049f (patch) | |
| tree | 08ff5e5c63f4a78a9c246d2b7c17b78eda6359cc | |
| parent | a0dfcf28d3af1179847c75a2a8981cb7fe967ab8 (diff) | |
| download | PROJ-095d2204f8bb05d172936aebbb1e9e44852c049f.tar.gz PROJ-095d2204f8bb05d172936aebbb1e9e44852c049f.zip | |
Remove duplicate instances of #include "proj_internal.h"
Introduced by "Merge projects.h into proj_internal.h" 8ab6f683.
30 files changed, 5 insertions, 35 deletions
diff --git a/src/apply_gridshift.cpp b/src/apply_gridshift.cpp index d9b5286d..fcd9fa01 100644 --- a/src/apply_gridshift.cpp +++ b/src/apply_gridshift.cpp @@ -34,7 +34,6 @@ #include <stdio.h> #include <string.h> -#include "proj_internal.h" #include "proj.h" #include "proj_internal.h" diff --git a/src/apply_vgridshift.cpp b/src/apply_vgridshift.cpp index 9be65f08..e73c6da7 100644 --- a/src/apply_vgridshift.cpp +++ b/src/apply_vgridshift.cpp @@ -33,7 +33,6 @@ #include "proj_math.h" #include "proj_internal.h" -#include "proj_internal.h" static int is_nodata(float value, double vmultiplier) { diff --git a/src/apps/cct.cpp b/src/apps/cct.cpp index 65718aca..d29b58fb 100644 --- a/src/apps/cct.cpp +++ b/src/apps/cct.cpp @@ -81,7 +81,6 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-25/2017-10-26 #include "proj.h" #include "proj_internal.h" #include "proj_strtod.h" -#include "proj_internal.h" #include "optargpm.h" diff --git a/src/apps/gie.cpp b/src/apps/gie.cpp index a84e77ab..47211aa8 100644 --- a/src/apps/gie.cpp +++ b/src/apps/gie.cpp @@ -117,7 +117,6 @@ Thomas Knudsen, thokn@sdfe.dk, 2017-10-01/2017-10-08 #include "proj_internal.h" #include "proj_math.h" #include "proj_strtod.h" -#include "proj_internal.h" #include "optargpm.h" diff --git a/src/conversions/axisswap.cpp b/src/conversions/axisswap.cpp index 97c8899a..15ec016b 100644 --- a/src/conversions/axisswap.cpp +++ b/src/conversions/axisswap.cpp @@ -59,7 +59,6 @@ operation: #include "proj.h" #include "proj_internal.h" -#include "proj_internal.h" PROJ_HEAD(axisswap, "Axis ordering"); diff --git a/src/conversions/cart.cpp b/src/conversions/cart.cpp index d9aea9b8..e6942d65 100644 --- a/src/conversions/cart.cpp +++ b/src/conversions/cart.cpp @@ -43,7 +43,6 @@ #define PJ_LIB__ #include "proj_internal.h" -#include "proj_internal.h" #include "proj_math.h" PROJ_HEAD(cart, "Geodetic/cartesian conversions"); diff --git a/src/conversions/geoc.cpp b/src/conversions/geoc.cpp index e0ca3df3..3d86b531 100644 --- a/src/conversions/geoc.cpp +++ b/src/conversions/geoc.cpp @@ -32,7 +32,6 @@ #include "proj.h" #include "proj_internal.h" -#include "proj_internal.h" PROJ_HEAD(geoc, "Geocentric Latitude"); diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp index 1e3372d6..e436a222 100644 --- a/src/conversions/unitconvert.cpp +++ b/src/conversions/unitconvert.cpp @@ -72,7 +72,6 @@ Last update: 2017-05-16 #include "proj_internal.h" #include "proj_math.h" -#include "proj_internal.h" PROJ_HEAD(unitconvert, "Unit conversion"); diff --git a/src/ell_set.cpp b/src/ell_set.cpp index d0714bee..c0b9016d 100644 --- a/src/ell_set.cpp +++ b/src/ell_set.cpp @@ -6,7 +6,6 @@ #include "proj.h" #include "proj_internal.h" -#include "proj_internal.h" /* Prototypes of the pj_ellipsoid helper functions */ diff --git a/src/factors.cpp b/src/factors.cpp index f50c8e21..7c59ee7a 100644 --- a/src/factors.cpp +++ b/src/factors.cpp @@ -3,7 +3,6 @@ #include "proj.h" #include "proj_internal.h" #include "proj_math.h" -#include "proj_internal.h" #include <errno.h> diff --git a/src/fwd.cpp b/src/fwd.cpp index a8c51934..c267045a 100644 --- a/src/fwd.cpp +++ b/src/fwd.cpp @@ -33,7 +33,6 @@ #include "proj_internal.h" #include "proj_math.h" -#include "proj_internal.h" #define INPUT_UNITS P->left #define OUTPUT_UNITS P->right diff --git a/src/gridinfo.cpp b/src/gridinfo.cpp index bff487f5..7f7d930f 100644 --- a/src/gridinfo.cpp +++ b/src/gridinfo.cpp @@ -36,7 +36,6 @@ #include <string.h> #include "proj_internal.h" -#include "proj_internal.h" /************************************************************************/ /* swap_words() */ diff --git a/src/init.cpp b/src/init.cpp index 1c0eddf0..cfcba96f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -40,7 +40,6 @@ #include "proj.h" #include "proj_internal.h" #include "proj_math.h" -#include "proj_internal.h" /**************************************************************************************/ diff --git a/src/inv.cpp b/src/inv.cpp index a05f8376..b9520c53 100644 --- a/src/inv.cpp +++ b/src/inv.cpp @@ -32,7 +32,6 @@ #include "proj_internal.h" #include "proj_math.h" -#include "proj_internal.h" #define INPUT_UNITS P->right #define OUTPUT_UNITS P->left diff --git a/src/nad_intr.cpp b/src/nad_intr.cpp index 2c301ef8..8dc2f652 100644 --- a/src/nad_intr.cpp +++ b/src/nad_intr.cpp @@ -1,9 +1,8 @@ /* Determine nad table correction value */ #define PJ_LIB__ -#include "proj_internal.h" -#include "proj_math.h" #include "proj.h" #include "proj_internal.h" +#include "proj_math.h" PJ_LP nad_intr(PJ_LP t, struct CTABLE *ct) { PJ_LP val, frct; diff --git a/src/pipeline.cpp b/src/pipeline.cpp index 39563c65..afa3b19a 100644 --- a/src/pipeline.cpp +++ b/src/pipeline.cpp @@ -105,7 +105,6 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-20 #include "geodesic.h" #include "proj.h" #include "proj_internal.h" -#include "proj_internal.h" PROJ_HEAD(pipeline, "Transformation pipeline manager"); PROJ_HEAD(pop, "Retrieve coordinate value from pipeline stack"); 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 <errno.h> #include <math.h> -#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 <errno.h> #include <math.h> -#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 <limits> #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 <float.h> #include <math.h> -#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 <float.h> #include <math.h> -#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"; diff --git a/src/transformations/deformation.cpp b/src/transformations/deformation.cpp index 0e0d641c..5bb86909 100644 --- a/src/transformations/deformation.cpp +++ b/src/transformations/deformation.cpp @@ -56,7 +56,6 @@ grid-values in units of mm/year in ENU-space. #include "proj.h" #include "proj_internal.h" #include "proj_math.h" -#include "proj_internal.h" PROJ_HEAD(deformation, "Kinematic grid shift"); diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp index c00fad2f..63785ea5 100644 --- a/src/transformations/helmert.cpp +++ b/src/transformations/helmert.cpp @@ -53,7 +53,6 @@ Last update: 2018-10-26 #include <math.h> #include "proj_internal.h" -#include "proj_internal.h" #include "geocent.h" PROJ_HEAD(helmert, "3(6)-, 4(8)- and 7(14)-parameter Helmert shift"); diff --git a/src/transformations/hgridshift.cpp b/src/transformations/hgridshift.cpp index 2e2294cb..90633939 100644 --- a/src/transformations/hgridshift.cpp +++ b/src/transformations/hgridshift.cpp @@ -6,7 +6,6 @@ #include <time.h> #include "proj_internal.h" -#include "proj_internal.h" PROJ_HEAD(hgridshift, "Horizontal grid shift"); diff --git a/src/transformations/horner.cpp b/src/transformations/horner.cpp index f5d749c4..a6638773 100644 --- a/src/transformations/horner.cpp +++ b/src/transformations/horner.cpp @@ -85,7 +85,6 @@ #include "proj.h" #include "proj_internal.h" -#include "proj_internal.h" PROJ_HEAD(horner, "Horner polynomial evaluation"); diff --git a/src/transformations/molodensky.cpp b/src/transformations/molodensky.cpp index 289c321e..7d17f64c 100644 --- a/src/transformations/molodensky.cpp +++ b/src/transformations/molodensky.cpp @@ -49,7 +49,6 @@ #include "proj.h" #include "proj_internal.h" -#include "proj_internal.h" PROJ_HEAD(molodensky, "Molodensky transform"); diff --git a/src/transformations/vgridshift.cpp b/src/transformations/vgridshift.cpp index 4cd48fb6..de0cdd8c 100644 --- a/src/transformations/vgridshift.cpp +++ b/src/transformations/vgridshift.cpp @@ -6,7 +6,6 @@ #include <time.h> #include "proj_internal.h" -#include "proj_internal.h" PROJ_HEAD(vgridshift, "Vertical grid shift"); |
