aboutsummaryrefslogtreecommitdiff
path: root/src/pj_gauss.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-12-18 21:31:28 +0100
committerEven Rouault <even.rouault@spatialys.com>2018-12-26 10:08:53 +0100
commit8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 (patch)
tree1cd5751c91202070ba3ab6fbbbfbeb7832b980fc /src/pj_gauss.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/pj_gauss.cpp')
-rw-r--r--src/pj_gauss.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pj_gauss.cpp b/src/pj_gauss.cpp
index 45b93f59..2db713ad 100644
--- a/src/pj_gauss.cpp
+++ b/src/pj_gauss.cpp
@@ -50,8 +50,8 @@ void *pj_gauss_ini(double e, double phi0, double *chi, double *rc) {
double sphi, cphi, es;
struct GAUSS *en;
- if ((en = (struct GAUSS *)malloc(sizeof(struct GAUSS))) == NULL)
- return (NULL);
+ if ((en = (struct GAUSS *)malloc(sizeof(struct GAUSS))) == nullptr)
+ return (nullptr);
es = e * e;
en->e = e;
sphi = sin(phi0);
@@ -60,7 +60,7 @@ void *pj_gauss_ini(double e, double phi0, double *chi, double *rc) {
en->C = sqrt(1. + es * cphi * cphi / (1. - es));
if (en->C == 0.0) {
free(en);
- return NULL;
+ return nullptr;
}
*chi = asin(sphi / en->C);
en->ratexp = 0.5 * en->C * e;