diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-18 22:02:44 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 10:08:54 +0100 |
| commit | 8198bb580a5640415e09b8fd3533ffaa11317ca6 (patch) | |
| tree | 61b68db0d946e19c3b71f590320babda05886510 /src/geodesic.cpp | |
| parent | 8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 (diff) | |
| download | PROJ-8198bb580a5640415e09b8fd3533ffaa11317ca6.tar.gz PROJ-8198bb580a5640415e09b8fd3533ffaa11317ca6.zip | |
cpp conversion: fix remaining warnings
Diffstat (limited to 'src/geodesic.cpp')
| -rw-r--r-- | src/geodesic.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/geodesic.cpp b/src/geodesic.cpp index badfc9fa..705056b6 100644 --- a/src/geodesic.cpp +++ b/src/geodesic.cpp @@ -507,13 +507,13 @@ real geod_genposition(const struct geod_geodesicline* l, real omg12, lam12, lon12; real ssig2, csig2, sbet2, cbet2, somg2, comg2, salp2, calp2, dn2; unsigned outmask = - (plat2 ? GEOD_LATITUDE : 0U) | - (plon2 ? GEOD_LONGITUDE : 0U) | - (pazi2 ? GEOD_AZIMUTH : 0U) | - (ps12 ? GEOD_DISTANCE : 0U) | - (pm12 ? GEOD_REDUCEDLENGTH : 0U) | - (pM12 || pM21 ? GEOD_GEODESICSCALE : 0U) | - (pS12 ? GEOD_AREA : 0U); + (plat2 ? GEOD_LATITUDE : GEOD_NONE) | + (plon2 ? GEOD_LONGITUDE : GEOD_NONE) | + (pazi2 ? GEOD_AZIMUTH : GEOD_NONE) | + (ps12 ? GEOD_DISTANCE : GEOD_NONE) | + (pm12 ? GEOD_REDUCEDLENGTH : GEOD_NONE) | + (pM12 || pM21 ? GEOD_GEODESICSCALE : GEOD_NONE) | + (pS12 ? GEOD_AREA : GEOD_NONE); outmask &= l->caps & OUT_ALL; if (!( TRUE /*Init()*/ && @@ -721,13 +721,13 @@ real geod_gendirect(const struct geod_geodesic* g, real* pS12) { struct geod_geodesicline l; unsigned outmask = - (plat2 ? GEOD_LATITUDE : 0U) | - (plon2 ? GEOD_LONGITUDE : 0U) | - (pazi2 ? GEOD_AZIMUTH : 0U) | - (ps12 ? GEOD_DISTANCE : 0U) | - (pm12 ? GEOD_REDUCEDLENGTH : 0U) | - (pM12 || pM21 ? GEOD_GEODESICSCALE : 0U) | - (pS12 ? GEOD_AREA : 0U); + (plat2 ? GEOD_LATITUDE : GEOD_NONE) | + (plon2 ? GEOD_LONGITUDE : GEOD_NONE) | + (pazi2 ? GEOD_AZIMUTH : GEOD_NONE) | + (ps12 ? GEOD_DISTANCE : GEOD_NONE) | + (pm12 ? GEOD_REDUCEDLENGTH : GEOD_NONE) | + (pM12 || pM21 ? GEOD_GEODESICSCALE : GEOD_NONE) | + (pS12 ? GEOD_AREA : GEOD_NONE); geod_lineinit(&l, g, lat1, lon1, azi1, /* Automatically supply GEOD_DISTANCE_IN if necessary */ @@ -764,10 +764,10 @@ static real geod_geninverse_int(const struct geod_geodesic* g, real omg12 = 0, somg12 = 2, comg12 = 0; unsigned outmask = - (ps12 ? GEOD_DISTANCE : 0U) | - (pm12 ? GEOD_REDUCEDLENGTH : 0U) | - (pM12 || pM21 ? GEOD_GEODESICSCALE : 0U) | - (pS12 ? GEOD_AREA : 0U); + (ps12 ? GEOD_DISTANCE : GEOD_NONE) | + (pm12 ? GEOD_REDUCEDLENGTH : GEOD_NONE) | + (pM12 || pM21 ? GEOD_GEODESICSCALE : GEOD_NONE) | + (pS12 ? GEOD_AREA : GEOD_NONE); outmask &= OUT_ALL; /* Compute longitude difference (AngDiff does this carefully). Result is |