diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2020-11-26 20:58:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-26 20:58:01 +0100 |
| commit | 3cb26a406a7e1a964f5f3b5caf3c624222664fb2 (patch) | |
| tree | 414dad90bd94170f6e619197b9a47bfca096d322 /src/projections/aitoff.cpp | |
| parent | f5b3616bb03f8e52a5e5a23704d645492a662393 (diff) | |
| parent | d9205b9245388f23b65917a21ec72d6bec15d035 (diff) | |
| download | PROJ-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/aitoff.cpp')
| -rw-r--r-- | src/projections/aitoff.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/projections/aitoff.cpp b/src/projections/aitoff.cpp index 7920309c..857ebb80 100644 --- a/src/projections/aitoff.cpp +++ b/src/projections/aitoff.cpp @@ -170,7 +170,7 @@ static PJ_LP aitoff_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inver if (iter == MAXITER && round == MAXROUND) { - pj_ctx_set_errno( P->ctx, PJD_ERR_NON_CONVERGENT ); + proj_context_errno_set( P->ctx, PJD_ERR_NON_CONVERGENT ); /* fprintf(stderr, "Warning: Accuracy of 1e-12 not reached. Last increments: dlat=%e and dlon=%e\n", dp, dl); */ } @@ -187,7 +187,7 @@ static PJ *setup(PJ *P) { PJ *PROJECTION(aitoff) { - 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; @@ -198,7 +198,7 @@ PJ *PROJECTION(aitoff) { PJ *PROJECTION(wintri) { - 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; |