diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-18 21:31:28 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 10:08:53 +0100 |
| commit | 8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 (patch) | |
| tree | 1cd5751c91202070ba3ab6fbbbfbeb7832b980fc /src/PJ_axisswap.cpp | |
| parent | 919dc5ca50839541568ef5c0f18f2156d639beef (diff) | |
| download | PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip | |
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/PJ_axisswap.cpp')
| -rw-r--r-- | src/PJ_axisswap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/PJ_axisswap.cpp b/src/PJ_axisswap.cpp index 69edac8b..8714ec85 100644 --- a/src/PJ_axisswap.cpp +++ b/src/PJ_axisswap.cpp @@ -167,7 +167,7 @@ PJ *CONVERSION(axisswap,0) { char *s; unsigned int i, j, n = 0; - if (0==Q) + if (nullptr==Q) return pj_default_destructor (P, ENOMEM); P->opaque = (void *) Q; @@ -189,7 +189,7 @@ PJ *CONVERSION(axisswap,0) { /* check that all characters are valid */ for (i=0; i<strlen(order); i++) - if (strchr("1234-,", order[i]) == 0) { + if (strchr("1234-,", order[i]) == nullptr) { proj_log_error(P, "axisswap: unknown axis '%c'", order[i]); return pj_default_destructor(P, PJD_ERR_AXIS); } @@ -275,7 +275,7 @@ PJ *CONVERSION(axisswap,0) { } - if (P->fwd4d == NULL && P->fwd3d == NULL && P->fwd == NULL) { + if (P->fwd4d == nullptr && P->fwd3d == nullptr && P->fwd == nullptr) { proj_log_error(P, "swapaxis: bad axis order"); return pj_default_destructor(P, PJD_ERR_AXIS); } |