Imported Upstream version 1.72.0

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

diff --git a/boost/geometry/srs/projections/proj/gnom.hpp b/boost/geometry/srs/projections/proj/gnom.hpp
index 6c9ca3a..bde8e19 100644 (file)
--- a/boost/geometry/srs/projections/proj/gnom.hpp
+++ b/boost/geometry/srs/projections/proj/gnom.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,
@@ -74,20 +74,14 @@ namespace projections
                 mode_type mode;
             };
 
-            // template class, using CRTP to implement forward/inverse
             template <typename T, typename Parameters>
             struct base_gnom_spheroid
-                : public base_t_fi<base_gnom_spheroid<T, Parameters>, T, Parameters>
             {
                 par_gnom<T> m_proj_parm;
 
-                inline base_gnom_spheroid(const Parameters& par)
-                    : base_t_fi<base_gnom_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& , T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
                 {
                     T  coslam, cosphi, sinphi;
 
@@ -133,7 +127,7 @@ namespace projections
 
                 // 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
                 {
                     static const T half_pi = detail::half_pi<T>();
 
@@ -144,7 +138,7 @@ namespace projections
                     cosz = sqrt(1. - sinz * sinz);
 
                     if (fabs(rh) <= epsilon10) {
-                        lp_lat = this->m_par.phi0;
+                        lp_lat = par.phi0;
                         lp_lon = 0.;
                     } else {
                         switch (this->m_proj_parm.mode) {
@@ -223,10 +217,9 @@ namespace projections
     struct gnom_spheroid : public detail::gnom::base_gnom_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline gnom_spheroid(Params const& , Parameters const& par)
-            : detail::gnom::base_gnom_spheroid<T, Parameters>(par)
+        inline gnom_spheroid(Params const& , Parameters & par)
         {
-            detail::gnom::setup_gnom(this->m_par, this->m_proj_parm);
+            detail::gnom::setup_gnom(par, this->m_proj_parm);
         }
     };
 
@@ -235,7 +228,7 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_gnom, gnom_spheroid, gnom_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_gnom, gnom_spheroid)
 
         // Factory entry(s)
         BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(gnom_entry, gnom_spheroid)