diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-12-31 11:37:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 11:37:51 +0100 |
| commit | 32f3ef47e55c38b0eabb6d781fee3944d3239414 (patch) | |
| tree | ba2850500ee732559bada055dbab281ceff49a22 /src/gauss.cpp | |
| parent | 5c41d3a1078895ed096b416db15c91108bccad87 (diff) | |
| parent | 0e0e0e475414ddeb75e0e140d8a3381a431036d9 (diff) | |
| download | PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.tar.gz PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.zip | |
Merge pull request #1208 from rouault/merge_PJ_and_PJ_OBJ
Unify PJ_OBJ and PJ structures
Diffstat (limited to 'src/gauss.cpp')
| -rw-r--r-- | src/gauss.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gauss.cpp b/src/gauss.cpp index 2db713ad..b7a27191 100644 --- a/src/gauss.cpp +++ b/src/gauss.cpp @@ -28,7 +28,8 @@ #include <math.h> #include <stdlib.h> -#include "projects.h" +#include "proj.h" +#include "proj_internal.h" #define MAX_ITER 20 @@ -70,9 +71,9 @@ void *pj_gauss_ini(double e, double phi0, double *chi, double *rc) { return ((void *)en); } -LP pj_gauss(projCtx ctx, LP elp, const void *data) { +PJ_LP pj_gauss(projCtx ctx, PJ_LP elp, const void *data) { const struct GAUSS *en = (const struct GAUSS *)data; - LP slp; + PJ_LP slp; (void) ctx; slp.phi = 2. * atan( en->K * @@ -82,9 +83,9 @@ LP pj_gauss(projCtx ctx, LP elp, const void *data) { return(slp); } -LP pj_inv_gauss(projCtx ctx, LP slp, const void *data) { +PJ_LP pj_inv_gauss(projCtx ctx, PJ_LP slp, const void *data) { const struct GAUSS *en = (const struct GAUSS *)data; - LP elp; + PJ_LP elp; double num; int i; |