Imported Upstream version 1.72.0

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

diff --git a/boost/geometry/srs/projections/proj/bacon.hpp b/boost/geometry/srs/projections/proj/bacon.hpp
index 17b3c36..8cdf23a 100644 (file)
--- a/boost/geometry/srs/projections/proj/bacon.hpp
+++ b/boost/geometry/srs/projections/proj/bacon.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,
@@ -61,24 +61,18 @@ namespace projections
 
             struct par_bacon
             {
-                int bacn;
-                int ortl;
+                bool bacn;
+                bool ortl;
             };
 
-            // template class, using CRTP to implement forward/inverse
             template <typename T, typename Parameters>
             struct base_bacon_spheroid
-                : public base_t_f<base_bacon_spheroid<T, Parameters>, T, Parameters>
             {
                 par_bacon m_proj_parm;
 
-                inline base_bacon_spheroid(const Parameters& par)
-                    : base_t_f<base_bacon_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
                 {
                     static const T half_pi = detail::half_pi<T>();
                     static const T half_pi_sqr = detail::half_pi_sqr<T>();
@@ -109,7 +103,7 @@ namespace projections
             template <typename Parameters>
             inline void setup_apian(Parameters& par, par_bacon& proj_parm)
             {
-                proj_parm.bacn = proj_parm.ortl = 0;
+                proj_parm.bacn = proj_parm.ortl = false;
                 par.es = 0.;
             }
 
@@ -117,8 +111,8 @@ namespace projections
             template <typename Parameters>
             inline void setup_ortel(Parameters& par, par_bacon& proj_parm)
             {
-                proj_parm.bacn = 0;
-                proj_parm.ortl = 1;
+                proj_parm.bacn = false;
+                proj_parm.ortl = true;
                 par.es = 0.;
             }
 
@@ -126,8 +120,8 @@ namespace projections
             template <typename Parameters>
             inline void setup_bacon(Parameters& par, par_bacon& proj_parm)
             {
-                proj_parm.bacn = 1;
-                proj_parm.ortl = 0;
+                proj_parm.bacn = true;
+                proj_parm.ortl = false;
                 par.es = 0.;
             }
 
@@ -151,10 +145,9 @@ namespace projections
     struct apian_spheroid : public detail::bacon::base_bacon_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline apian_spheroid(Params const& , Parameters const& par)
-            : detail::bacon::base_bacon_spheroid<T, Parameters>(par)
+        inline apian_spheroid(Params const& , Parameters & par)
         {
-            detail::bacon::setup_apian(this->m_par, this->m_proj_parm);
+            detail::bacon::setup_apian(par, this->m_proj_parm);
         }
     };
 
@@ -175,10 +168,9 @@ namespace projections
     struct ortel_spheroid : public detail::bacon::base_bacon_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline ortel_spheroid(Params const& , Parameters const& par)
-            : detail::bacon::base_bacon_spheroid<T, Parameters>(par)
+        inline ortel_spheroid(Params const& , Parameters & par)
         {
-            detail::bacon::setup_ortel(this->m_par, this->m_proj_parm);
+            detail::bacon::setup_ortel(par, this->m_proj_parm);
         }
     };
 
@@ -199,10 +191,9 @@ namespace projections
     struct bacon_spheroid : public detail::bacon::base_bacon_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline bacon_spheroid(Params const& , Parameters const& par)
-            : detail::bacon::base_bacon_spheroid<T, Parameters>(par)
+        inline bacon_spheroid(Params const& , Parameters & par)
         {
-            detail::bacon::setup_bacon(this->m_par, this->m_proj_parm);
+            detail::bacon::setup_bacon(par, this->m_proj_parm);
         }
     };
 
@@ -211,9 +202,9 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_apian, apian_spheroid, apian_spheroid)
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_bacon, bacon_spheroid, bacon_spheroid)
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_ortel, ortel_spheroid, ortel_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_apian, apian_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_bacon, bacon_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_ortel, ortel_spheroid)
 
         // Factory entry(s)
         BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_F(apian_entry, apian_spheroid)