aboutsummaryrefslogtreecommitdiff
path: root/src/projections/chamb.cpp
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2020-11-26 20:58:01 +0100
committerGitHub <noreply@github.com>2020-11-26 20:58:01 +0100
commit3cb26a406a7e1a964f5f3b5caf3c624222664fb2 (patch)
tree414dad90bd94170f6e619197b9a47bfca096d322 /src/projections/chamb.cpp
parentf5b3616bb03f8e52a5e5a23704d645492a662393 (diff)
parentd9205b9245388f23b65917a21ec72d6bec15d035 (diff)
downloadPROJ-3cb26a406a7e1a964f5f3b5caf3c624222664fb2.tar.gz
PROJ-3cb26a406a7e1a964f5f3b5caf3c624222664fb2.zip
Merge pull request #2403 from kbevers/remove-proj_api.h
Remove proj_api.h
Diffstat (limited to 'src/projections/chamb.cpp')
-rw-r--r--src/projections/chamb.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/projections/chamb.cpp b/src/projections/chamb.cpp
index 36609e79..b315832a 100644
--- a/src/projections/chamb.cpp
+++ b/src/projections/chamb.cpp
@@ -29,7 +29,7 @@ PROJ_HEAD(chamb, "Chamberlin Trimetric") "\n\tMisc Sph, no inv"
#define TOL 1e-9
/* distance and azimuth from point 1 to point 2 */
-static VECT vect(projCtx ctx, double dphi, double c1, double s1, double c2, double s2, double dlam) {
+static VECT vect(PJ_CONTEXT *ctx, double dphi, double c1, double s1, double c2, double s2, double dlam) {
VECT v;
double cdl, dp, dl;
@@ -49,7 +49,7 @@ static VECT vect(projCtx ctx, double dphi, double c1, double s1, double c2, doub
}
/* law of cosines */
-static double lc(projCtx ctx, double b,double c,double a) {
+static double lc(PJ_CONTEXT *ctx, double b,double c,double a) {
return aacos(ctx, .5 * (b * b + c * c - a * a) / (b * c));
}
@@ -103,7 +103,7 @@ static PJ_XY chamb_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forwar
PJ *PROJECTION(chamb) {
int i, j;
char line[10];
- struct pj_opaque *Q = static_cast<struct pj_opaque*>(pj_calloc (1, sizeof (struct pj_opaque)));
+ struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
if (nullptr==Q)
return pj_default_destructor (P, ENOMEM);
P->opaque = Q;