Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / geometry / srs / projections / proj / tcea.hpp

diff --git a/boost/geometry/srs/projections/proj/tcea.hpp b/boost/geometry/srs/projections/proj/tcea.hpp
index 44a04f3..f442e01 100644 (file)
--- a/boost/geometry/srs/projections/proj/tcea.hpp
+++ b/boost/geometry/srs/projections/proj/tcea.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017, 2018.
-// Modifications copyright (c) 2017-2018, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017, 2018, 2019.
+// Modifications copyright (c) 2017-2019, 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,
@@ -53,31 +53,25 @@ namespace projections
     #ifndef DOXYGEN_NO_DETAIL
     namespace detail { namespace tcea
     {
-            // template class, using CRTP to implement forward/inverse
             template <typename T, typename Parameters>
             struct base_tcea_spheroid
-                : public base_t_fi<base_tcea_spheroid<T, Parameters>, T, Parameters>
             {
-                inline base_tcea_spheroid(const Parameters& par)
-                    : base_t_fi<base_tcea_spheroid<T, Parameters>, T, Parameters>(*this, par)
-                {}
-
                 // FORWARD(s_forward)  spheroid
                 // Project coordinates from geographic (lon, lat) to cartesian (x, y)
-                inline void fwd(T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
+                inline void fwd(Parameters const& par, T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
                 {
-                    xy_x = cos(lp_lat) * sin(lp_lon) / this->m_par.k0;
-                    xy_y = this->m_par.k0 * (atan2(tan(lp_lat), cos(lp_lon)) - this->m_par.phi0);
+                    xy_x = cos(lp_lat) * sin(lp_lon) / par.k0;
+                    xy_y = par.k0 * (atan2(tan(lp_lat), cos(lp_lon)) - par.phi0);
                 }
 
                 // INVERSE(s_inverse)  spheroid
                 // Project coordinates from cartesian (x, y) to geographic (lon, lat)
-                inline void inv(T xy_x, T xy_y, T& lp_lon, T& lp_lat) const
+                inline void inv(Parameters const& par, T xy_x, T xy_y, T& lp_lon, T& lp_lat) const
                 {
                     T t;
 
-                    xy_y = xy_y / this->m_par.k0 + this->m_par.phi0;
-                    xy_x *= this->m_par.k0;
+                    xy_y = xy_y / par.k0 + par.phi0;
+                    xy_x *= par.k0;
                     t = sqrt(1. - xy_x * xy_x);
                     lp_lat = asin(t * sin(xy_y));
                     lp_lon = atan2(xy_x, t * cos(xy_y));
@@ -116,10 +110,9 @@ namespace projections
     struct tcea_spheroid : public detail::tcea::base_tcea_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline tcea_spheroid(Params const& , Parameters const& par)
-            : detail::tcea::base_tcea_spheroid<T, Parameters>(par)
+        inline tcea_spheroid(Params const& , Parameters & par)
         {
-            detail::tcea::setup_tcea(this->m_par);
+            detail::tcea::setup_tcea(par);
         }
     };
 
@@ -128,7 +121,7 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_tcea, tcea_spheroid, tcea_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_tcea, tcea_spheroid)
 
         // Factory entry(s)
         BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(tcea_entry, tcea_spheroid)