boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-13 00:22:10 +00:00
Code Issues Projects Releases Wiki Activity

[extensions][proj] Fix compilation error

Browse Source
This commit is contained in:
Adam Wulkiewicz
2014-07-25 15:04:20 +02:00
parent 592b0f500b
commit c4e442fffe
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/geometry/extensions/gis/projections/impl/pj_ell_set.hpp
View File

@@ -126,18 +126,21 @@ inline void pj_ell_set(std::vector<pvalue>& parameters, double &a, double &es)
} else if (pj_param(parameters, "bR_h").i) { /* sphere--harmonic mean */
a = 2. * a * b / (a + b);
es = 0.;
} else if ((int i = pj_param(parameters, "tR_lat_a").i) || /* sphere--arith. */
pj_param(parameters, "tR_lat_g").i) { /* or geom. mean at latitude */
double tmp;
} else {
int i = pj_param(parameters, "tR_lat_a").i;
if (i || /* sphere--arith. */
pj_param(parameters, "tR_lat_g").i) { /* or geom. mean at latitude */
double tmp;
tmp = sin(pj_param(parameters, i ? "rR_lat_a" : "rR_lat_g").f);
if (geometry::math::abs(tmp) > HALFPI) {
throw proj_exception(-11);
tmp = sin(pj_param(parameters, i ? "rR_lat_a" : "rR_lat_g").f);
if (geometry::math::abs(tmp) > HALFPI) {
throw proj_exception(-11);
}
tmp = 1. - es * tmp * tmp;
a *= i ? .5 * (1. - es + tmp) / ( tmp * sqrt(tmp)) :
sqrt(1. - es) / tmp;
es = 0.;
}
tmp = 1. - es * tmp * tmp;
a *= i ? .5 * (1. - es + tmp) / ( tmp * sqrt(tmp)) :
sqrt(1. - es) / tmp;
es = 0.;
}
}