summaryrefslogtreecommitdiff
path: root/boost/geometry/srs/projections/impl/pj_phi2.hpp
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 15:18:43 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 15:18:43 +0900
commit5ce2ccf2f23c6d3de4c79f216f57ca6f2a18ed16 (patch)
treebbee48efb9867d19ac3fdd84ba714c7af326cd53 /boost/geometry/srs/projections/impl/pj_phi2.hpp
parentb8cf34c691623e4ec329053cbbf68522a855882d (diff)
downloadboost-5ce2ccf2f23c6d3de4c79f216f57ca6f2a18ed16.tar.gz
boost-5ce2ccf2f23c6d3de4c79f216f57ca6f2a18ed16.tar.bz2
boost-5ce2ccf2f23c6d3de4c79f216f57ca6f2a18ed16.zip
Imported Upstream version 1.68.0upstream/1.68.0
Diffstat (limited to 'boost/geometry/srs/projections/impl/pj_phi2.hpp')
-rw-r--r--boost/geometry/srs/projections/impl/pj_phi2.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/boost/geometry/srs/projections/impl/pj_phi2.hpp b/boost/geometry/srs/projections/impl/pj_phi2.hpp
index 71f0cf1249..868a8c659b 100644
--- a/boost/geometry/srs/projections/impl/pj_phi2.hpp
+++ b/boost/geometry/srs/projections/impl/pj_phi2.hpp
@@ -3,8 +3,8 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// This file was modified by Oracle on 2017.
-// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017, 2018.
+// Modifications copyright (c) 2017-2018, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
@@ -58,12 +58,12 @@ inline T pj_phi2(T const& ts, T const& e)
i = N_ITER;
do {
con = e * sin (Phi);
- dphi = geometry::math::half_pi<T>() - 2. * atan (ts * pow((1. - con) /
- (1. + con), eccnth)) - Phi;
+ dphi = geometry::math::half_pi<T>() - 2. * atan (ts * math::pow((T(1) - con) /
+ (T(1) + con), eccnth)) - Phi;
Phi += dphi;
} while ( geometry::math::abs(dphi) > TOL && --i);
if (i <= 0)
- BOOST_THROW_EXCEPTION( projection_exception(-18) );
+ BOOST_THROW_EXCEPTION( projection_exception(error_non_con_inv_phi2) );
return Phi;
}