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/conversions | |
| 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/conversions')
| -rw-r--r-- | src/conversions/axisswap.cpp | 2 | ||||
| -rw-r--r-- | src/conversions/set.cpp | 2 | ||||
| -rw-r--r-- | src/conversions/unitconvert.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/conversions/axisswap.cpp b/src/conversions/axisswap.cpp index 4ae2b4e4..1aa339c3 100644 --- a/src/conversions/axisswap.cpp +++ b/src/conversions/axisswap.cpp @@ -169,7 +169,7 @@ static PJ_COORD reverse_4d(PJ_COORD coo, PJ *P) { /***********************************************************************/ PJ *CONVERSION(axisswap,0) { /***********************************************************************/ - 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))); char *s; unsigned int i, j, n = 0; diff --git a/src/conversions/set.cpp b/src/conversions/set.cpp index 7628bf4f..2f30bda8 100644 --- a/src/conversions/set.cpp +++ b/src/conversions/set.cpp @@ -39,7 +39,7 @@ PJ *OPERATION(set, 0) { P->inv4d = set_fwd_inv; P->fwd4d = set_fwd_inv; - auto set = static_cast<struct Set*>(pj_calloc (1, sizeof(struct Set))); + auto set = static_cast<struct Set*>(calloc (1, sizeof(struct Set))); P->opaque = set; if (nullptr==P->opaque) return pj_default_destructor(P, ENOMEM); diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp index 172e2c48..61bccbf1 100644 --- a/src/conversions/unitconvert.cpp +++ b/src/conversions/unitconvert.cpp @@ -433,7 +433,7 @@ static double get_unit_conversion_factor(const char* name, /***********************************************************************/ PJ *CONVERSION(unitconvert,0) { /***********************************************************************/ - struct pj_opaque_unitconvert *Q = static_cast<struct pj_opaque_unitconvert*>(pj_calloc (1, sizeof (struct pj_opaque_unitconvert))); + struct pj_opaque_unitconvert *Q = static_cast<struct pj_opaque_unitconvert*>(calloc (1, sizeof (struct pj_opaque_unitconvert))); const char *s, *name; int i; double f; |
