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/mk_cheby.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/mk_cheby.cpp')
| -rw-r--r-- | src/mk_cheby.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mk_cheby.cpp b/src/mk_cheby.cpp index 5e6bfef0..0f3b97ed 100644 --- a/src/mk_cheby.cpp +++ b/src/mk_cheby.cpp @@ -1,9 +1,10 @@ -#include "projects.h" +#include "proj.h" +#include "proj_internal.h" static void /* sum coefficients less than res */ -eval(projUV **w, int nu, int nv, double res, projUV *resid) { +eval(PJ_UV **w, int nu, int nv, double res, PJ_UV *resid) { int i, j; double ab; - projUV *s; + PJ_UV *s; resid->u = resid->v = 0.; for (i = 0; i < nu; ++i) { @@ -41,14 +42,14 @@ makeT(int nru, int nrv) { return T; } Tseries * -mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV), +mk_cheby(PJ_UV a, PJ_UV b, double res, PJ_UV *resid, PJ_UV (*func)(PJ_UV), int nu, int nv, int power) { int j, i, nru, nrv, *ncu, *ncv; Tseries *T = nullptr; - projUV **w; + PJ_UV **w; double cutres; - if (!(w = (projUV **)vector2(nu, nv, sizeof(projUV)))) + if (!(w = (PJ_UV **)vector2(nu, nv, sizeof(PJ_UV)))) return nullptr; if (!(ncu = (int *)vector1(nu + nv, sizeof(int)))) { freev2((void **)w, nu); @@ -56,7 +57,7 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV), } ncv = ncu + nu; if (!bchgen(a, b, nu, nv, w, func)) { - projUV *s; + PJ_UV *s; double ab, *p; /* analyse coefficients and adjust until residual OK */ |