Imported Upstream version 1.72.0

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

diff --git a/boost/geometry/srs/projections/proj/geos.hpp b/boost/geometry/srs/projections/proj/geos.hpp
index f9f2901..e27786e 100644 (file)
--- a/boost/geometry/srs/projections/proj/geos.hpp
+++ b/boost/geometry/srs/projections/proj/geos.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,
@@ -75,20 +75,14 @@ namespace projections
                 bool        flip_axis;
             };
 
-            // template class, using CRTP to implement forward/inverse
             template <typename T, typename Parameters>
             struct base_geos_ellipsoid
-                : public base_t_fi<base_geos_ellipsoid<T, Parameters>, T, Parameters>
             {
                 par_geos<T> m_proj_parm;
 
-                inline base_geos_ellipsoid(const Parameters& par)
-                    : base_t_fi<base_geos_ellipsoid<T, Parameters>, T, Parameters>(*this, par)
-                {}
-
                 // FORWARD(e_forward)  ellipsoid
                 // Project coordinates from geographic (lon, lat) to cartesian (x, y)
-                inline void fwd(T const& lp_lon, T lp_lat, T& xy_x, T& xy_y) const
+                inline void fwd(Parameters const& , T const& lp_lon, T lp_lat, T& xy_x, T& xy_y) const
                 {
                     T r, Vx, Vy, Vz, tmp;
 
@@ -121,7 +115,7 @@ namespace projections
 
                 // INVERSE(e_inverse)  ellipsoid
                 // Project coordinates from cartesian (x, y) to geographic (lon, lat)
-                inline void inv(T const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const
+                inline void inv(Parameters const& , T const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const
                 {
                     T Vx, Vy, Vz, a, b, det, k;
 
@@ -163,20 +157,14 @@ namespace projections
 
             };
 
-            // template class, using CRTP to implement forward/inverse
             template <typename T, typename Parameters>
             struct base_geos_spheroid
-                : public base_t_fi<base_geos_spheroid<T, Parameters>, T, Parameters>
             {
                 par_geos<T> m_proj_parm;
 
-                inline base_geos_spheroid(const Parameters& par)
-                    : base_t_fi<base_geos_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 Vx, Vy, Vz, tmp;
 
@@ -206,7 +194,7 @@ namespace projections
 
                 // INVERSE(s_inverse)  spheroid
                 // Project coordinates from cartesian (x, y) to geographic (lon, lat)
-                inline void inv(T const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const
+                inline void inv(Parameters const& , T const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const
                 {
                     T Vx, Vy, Vz, a, b, det, k;
 
@@ -325,9 +313,8 @@ namespace projections
     {
         template <typename Params>
         inline geos_ellipsoid(Params const& params, Parameters const& par)
-            : detail::geos::base_geos_ellipsoid<T, Parameters>(par)
         {
-            detail::geos::setup_geos(params, this->m_par, this->m_proj_parm);
+            detail::geos::setup_geos(params, par, this->m_proj_parm);
         }
     };
 
@@ -352,9 +339,8 @@ namespace projections
     {
         template <typename Params>
         inline geos_spheroid(Params const& params, Parameters const& par)
-            : detail::geos::base_geos_spheroid<T, Parameters>(par)
         {
-            detail::geos::setup_geos(params, this->m_par, this->m_proj_parm);
+            detail::geos::setup_geos(params, par, this->m_proj_parm);
         }
     };
 
@@ -363,7 +349,7 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_geos, geos_spheroid, geos_ellipsoid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI2(srs::spar::proj_geos, geos_spheroid, geos_ellipsoid)
 
         // Factory entry(s)
         BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI2(geos_entry, geos_spheroid, geos_ellipsoid)