aboutsummaryrefslogtreecommitdiff
path: root/src/geodesic.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/geodesic.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/geodesic.cpp')
-rw-r--r--src/geodesic.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/geodesic.cpp b/src/geodesic.cpp
index 220dcd7f..badfc9fa 100644
--- a/src/geodesic.cpp
+++ b/src/geodesic.cpp
@@ -693,12 +693,12 @@ real geod_genposition(const struct geod_geodesicline* l,
void geod_setdistance(struct geod_geodesicline* l, real s13) {
l->s13 = s13;
- l->a13 = geod_genposition(l, GEOD_NOFLAGS, l->s13, 0, 0, 0, 0, 0, 0, 0, 0);
+ l->a13 = geod_genposition(l, GEOD_NOFLAGS, l->s13, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
}
static void geod_setarc(struct geod_geodesicline* l, real a13) {
l->a13 = a13; l->s13 = NaN;
- geod_genposition(l, GEOD_ARCMODE, l->a13, 0, 0, 0, &l->s13, 0, 0, 0, 0);
+ geod_genposition(l, GEOD_ARCMODE, l->a13, nullptr, nullptr, nullptr, &l->s13, nullptr, nullptr, nullptr, nullptr);
}
void geod_gensetdistance(struct geod_geodesicline* l,
@@ -710,7 +710,7 @@ void geod_gensetdistance(struct geod_geodesicline* l,
void geod_position(const struct geod_geodesicline* l, real s12,
real* plat2, real* plon2, real* pazi2) {
- geod_genposition(l, FALSE, s12, plat2, plon2, pazi2, 0, 0, 0, 0, 0);
+ geod_genposition(l, FALSE, s12, plat2, plon2, pazi2, nullptr, nullptr, nullptr, nullptr, nullptr);
}
real geod_gendirect(const struct geod_geodesic* g,
@@ -742,7 +742,7 @@ void geod_direct(const struct geod_geodesic* g,
real s12,
real* plat2, real* plon2, real* pazi2) {
geod_gendirect(g, lat1, lon1, azi1, GEOD_NOFLAGS, s12, plat2, plon2, pazi2,
- 0, 0, 0, 0, 0);
+ nullptr, nullptr, nullptr, nullptr, nullptr);
}
static real geod_geninverse_int(const struct geod_geodesic* g,
@@ -858,9 +858,9 @@ static real geod_geninverse_int(const struct geod_geodesic* g,
sig12 = atan2(maxx((real)(0), csig1 * ssig2 - ssig1 * csig2),
csig1 * csig2 + ssig1 * ssig2);
Lengths(g, g->n, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2,
- cbet1, cbet2, &s12x, &m12x, 0,
- (outmask & GEOD_GEODESICSCALE) ? &M12 : 0,
- (outmask & GEOD_GEODESICSCALE) ? &M21 : 0,
+ cbet1, cbet2, &s12x, &m12x, nullptr,
+ (outmask & GEOD_GEODESICSCALE) ? &M12 : nullptr,
+ (outmask & GEOD_GEODESICSCALE) ? &M21 : nullptr,
Ca);
/* Add the check for sig12 since zero length geodesics might yield m12 <
* 0. Test case was
@@ -983,9 +983,9 @@ static real geod_geninverse_int(const struct geod_geodesic* g,
fabs(salp1 - salp1b) + (calp1 - calp1b) < tolb);
}
Lengths(g, eps, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2,
- cbet1, cbet2, &s12x, &m12x, 0,
- (outmask & GEOD_GEODESICSCALE) ? &M12 : 0,
- (outmask & GEOD_GEODESICSCALE) ? &M21 : 0, Ca);
+ cbet1, cbet2, &s12x, &m12x, nullptr,
+ (outmask & GEOD_GEODESICSCALE) ? &M12 : nullptr,
+ (outmask & GEOD_GEODESICSCALE) ? &M21 : nullptr, Ca);
m12x *= g->b;
s12x *= g->b;
a12 = sig12 / degree;
@@ -1115,9 +1115,9 @@ void geod_inverseline(struct geod_geodesicline* l,
real lat1, real lon1, real lat2, real lon2,
unsigned caps) {
real salp1, calp1,
- a12 = geod_geninverse_int(g, lat1, lon1, lat2, lon2, 0,
- &salp1, &calp1, 0, 0,
- 0, 0, 0, 0),
+ a12 = geod_geninverse_int(g, lat1, lon1, lat2, lon2, nullptr,
+ &salp1, &calp1, nullptr, nullptr,
+ nullptr, nullptr, nullptr, nullptr),
azi1 = atan2dx(salp1, calp1);
caps = caps ? caps : GEOD_DISTANCE_IN | GEOD_LONGITUDE;
/* Ensure that a12 can be converted to a distance */
@@ -1129,7 +1129,7 @@ void geod_inverseline(struct geod_geodesicline* l,
void geod_inverse(const struct geod_geodesic* g,
real lat1, real lon1, real lat2, real lon2,
real* ps12, real* pazi1, real* pazi2) {
- geod_geninverse(g, lat1, lon1, lat2, lon2, ps12, pazi1, pazi2, 0, 0, 0, 0);
+ geod_geninverse(g, lat1, lon1, lat2, lon2, ps12, pazi1, pazi2, nullptr, nullptr, nullptr, nullptr);
}
real SinCosSeries(boolx sinp, real sinx, real cosx, const real c[], int n) {
@@ -1371,7 +1371,7 @@ real InverseStart(const struct geod_geodesic* g,
* Inverse. */
Lengths(g, g->n, pi + bet12a,
sbet1, -cbet1, dn1, sbet2, cbet2, dn2,
- cbet1, cbet2, 0, &m12b, &m0, 0, 0, Ca);
+ cbet1, cbet2, nullptr, &m12b, &m0, nullptr, nullptr, Ca);
x = -1 + m12b / (cbet1 * cbet2 * m0 * pi);
betscale = x < -(real)(0.01) ? sbet12a / x :
-g->f * sq(cbet1) * pi;
@@ -1531,7 +1531,7 @@ real Lambda12(const struct geod_geodesic* g,
dlam12 = - 2 * g->f1 * dn1 / sbet1;
else {
Lengths(g, eps, sig12, ssig1, csig1, dn1, ssig2, csig2, dn2,
- cbet1, cbet2, 0, &dlam12, 0, 0, 0, Ca);
+ cbet1, cbet2, nullptr, &dlam12, nullptr, nullptr, nullptr, Ca);
dlam12 *= g->f1 / (calp2 * cbet2);
}
}
@@ -1819,7 +1819,7 @@ int transit(real lon1, real lon2) {
/* Compute lon12 the same way as Geodesic::Inverse. */
lon1 = AngNormalize(lon1);
lon2 = AngNormalize(lon2);
- lon12 = AngDiff(lon1, lon2, 0);
+ lon12 = AngDiff(lon1, lon2, nullptr);
return lon1 <= 0 && lon2 > 0 && lon12 > 0 ? 1 :
(lon2 <= 0 && lon1 > 0 && lon12 < 0 ? -1 : 0);
}
@@ -1893,7 +1893,7 @@ void geod_polygon_addpoint(const struct geod_geodesic* g,
} else {
real s12, S12 = 0; /* Initialize S12 to stop Visual Studio warning */
geod_geninverse(g, p->lat, p->lon, lat, lon,
- &s12, 0, 0, 0, 0, 0, p->polyline ? 0 : &S12);
+ &s12, nullptr, nullptr, nullptr, nullptr, nullptr, p->polyline ? nullptr : &S12);
accadd(p->P, s12);
if (!p->polyline) {
accadd(p->A, S12);
@@ -1912,8 +1912,8 @@ void geod_polygon_addedge(const struct geod_geodesic* g,
* lon is to make CLang static analyzer happy. */
real lat = 0, lon = 0, S12 = 0;
geod_gendirect(g, p->lat, p->lon, azi, GEOD_LONG_UNROLL, s,
- &lat, &lon, 0,
- 0, 0, 0, 0, p->polyline ? 0 : &S12);
+ &lat, &lon, nullptr,
+ nullptr, nullptr, nullptr, nullptr, p->polyline ? nullptr : &S12);
accadd(p->P, s);
if (!p->polyline) {
accadd(p->A, S12);
@@ -1940,7 +1940,7 @@ unsigned geod_polygon_compute(const struct geod_geodesic* g,
return p->num;
}
geod_geninverse(g, p->lat, p->lon, p->lat0, p->lon0,
- &s12, 0, 0, 0, 0, 0, &S12);
+ &s12, nullptr, nullptr, nullptr, nullptr, nullptr, &S12);
if (pP) *pP = accsum(p->P, s12);
acccopy(p->A, t);
accadd(t, S12);
@@ -1989,7 +1989,7 @@ unsigned geod_polygon_testpoint(const struct geod_geodesic* g,
geod_geninverse(g,
i == 0 ? p->lat : lat, i == 0 ? p->lon : lon,
i != 0 ? p->lat0 : lat, i != 0 ? p->lon0 : lon,
- &s12, 0, 0, 0, 0, 0, p->polyline ? 0 : &S12);
+ &s12, nullptr, nullptr, nullptr, nullptr, nullptr, p->polyline ? nullptr : &S12);
perimeter += s12;
if (!p->polyline) {
tempsum += S12;
@@ -2051,12 +2051,12 @@ unsigned geod_polygon_testedge(const struct geod_geodesic* g,
happy. */
real lat = 0, lon = 0, s12, S12 = 0;
geod_gendirect(g, p->lat, p->lon, azi, GEOD_LONG_UNROLL, s,
- &lat, &lon, 0,
- 0, 0, 0, 0, &S12);
+ &lat, &lon, nullptr,
+ nullptr, nullptr, nullptr, nullptr, &S12);
tempsum += S12;
crossings += transitdirect(p->lon, lon);
geod_geninverse(g, lat, lon, p->lat0, p->lon0,
- &s12, 0, 0, 0, 0, 0, &S12);
+ &s12, nullptr, nullptr, nullptr, nullptr, nullptr, &S12);
perimeter += s12;
tempsum += S12;
crossings += transit(lon, p->lon0);