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/nad_cvt.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/nad_cvt.cpp')
| -rw-r--r-- | src/nad_cvt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nad_cvt.cpp b/src/nad_cvt.cpp index ec4a2b47..76d2ccd0 100644 --- a/src/nad_cvt.cpp +++ b/src/nad_cvt.cpp @@ -3,14 +3,15 @@ #include <stdio.h> #include <stdlib.h> -#include "projects.h" +#include "proj.h" +#include "proj_internal.h" #include "proj_math.h" #define MAX_ITERATIONS 10 #define TOL 1e-12 -LP nad_cvt(LP in, int inverse, struct CTABLE *ct) { - LP t, tb,del, dif; +PJ_LP nad_cvt(PJ_LP in, int inverse, struct CTABLE *ct) { + PJ_LP t, tb,del, dif; int i = MAX_ITERATIONS; const double toltol = TOL*TOL; |