updated boost on windows
This commit is contained in:
@@ -169,11 +169,11 @@ public :
|
||||
typedef typename geometry::coordinate_type<P2>::type ct2;
|
||||
|
||||
set<0>(p2, boost::numeric_cast<ct2>(
|
||||
c1 * m_matrix(0,0) + c2 * m_matrix(0,1) + c3 * m_matrix(0,2) + m_matrix(0,3)));
|
||||
c1 * qvm::A<0,0>(m_matrix) + c2 * qvm::A<0,1>(m_matrix) + c3 * qvm::A<0,2>(m_matrix) + qvm::A<0,3>(m_matrix)));
|
||||
set<1>(p2, boost::numeric_cast<ct2>(
|
||||
c1 * m_matrix(1,0) + c2 * m_matrix(1,1) + c3 * m_matrix(1,2) + m_matrix(1,3)));
|
||||
c1 * qvm::A<1,0>(m_matrix) + c2 * qvm::A<1,1>(m_matrix) + c3 * qvm::A<1,2>(m_matrix) + qvm::A<1,3>(m_matrix)));
|
||||
set<2>(p2, boost::numeric_cast<ct2>(
|
||||
c1 * m_matrix(2,0) + c2 * m_matrix(2,1) + c3 * m_matrix(2,2) + m_matrix(2,3)));
|
||||
c1 * qvm::A<2,0>(m_matrix) + c2 * qvm::A<2,1>(m_matrix) + c3 * qvm::A<2,2>(m_matrix) + qvm::A<2,3>(m_matrix)));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
// Boost.Geometry (aka GGL, Generic Geometry Library)
|
||||
|
||||
// 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.
|
||||
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
|
||||
|
||||
// Use, modification and distribution is subject to the Boost Software License,
|
||||
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#ifndef BOOST_GEOMETRY_STRATEGIES_TRANSFORM_SRS_TRANSFORMER_HPP
|
||||
#define BOOST_GEOMETRY_STRATEGIES_TRANSFORM_SRS_TRANSFORMER_HPP
|
||||
|
||||
|
||||
namespace boost { namespace geometry
|
||||
{
|
||||
|
||||
namespace strategy { namespace transform
|
||||
{
|
||||
|
||||
/*!
|
||||
\brief Transformation strategy to do transform using a forward
|
||||
Map Projection or SRS transformation.
|
||||
\ingroup transform
|
||||
\tparam ProjectionOrTransformation SRS projection or transformation type
|
||||
*/
|
||||
template
|
||||
<
|
||||
typename ProjectionOrTransformation
|
||||
>
|
||||
class srs_forward_transformer
|
||||
{
|
||||
public:
|
||||
inline srs_forward_transformer()
|
||||
{}
|
||||
|
||||
template <typename Parameters>
|
||||
inline srs_forward_transformer(Parameters const& parameters)
|
||||
: m_proj_or_transform(parameters)
|
||||
{}
|
||||
|
||||
template <typename Parameters1, typename Parameters2>
|
||||
inline srs_forward_transformer(Parameters1 const& parameters1, Parameters2 const& parameters2)
|
||||
: m_proj_or_transform(parameters1, parameters2)
|
||||
{}
|
||||
|
||||
template <typename Geometry1, typename Geometry2>
|
||||
inline bool apply(Geometry1 const& g1, Geometry2 & g2) const
|
||||
{
|
||||
return m_proj_or_transform.forward(g1, g2);
|
||||
}
|
||||
|
||||
private:
|
||||
ProjectionOrTransformation m_proj_or_transform;
|
||||
};
|
||||
|
||||
|
||||
/*!
|
||||
\brief Transformation strategy to do transform using an inverse
|
||||
Map Projection or SRS transformation.
|
||||
\ingroup transform
|
||||
\tparam ProjectionOrTransformation SRS projection or transformation type
|
||||
*/
|
||||
template
|
||||
<
|
||||
typename ProjectionOrTransformation
|
||||
>
|
||||
class srs_inverse_transformer
|
||||
{
|
||||
public:
|
||||
inline srs_inverse_transformer()
|
||||
{}
|
||||
|
||||
template <typename Parameters>
|
||||
inline srs_inverse_transformer(Parameters const& parameters)
|
||||
: m_proj_or_transform(parameters)
|
||||
{}
|
||||
|
||||
template <typename Parameters1, typename Parameters2>
|
||||
inline srs_inverse_transformer(Parameters1 const& parameters1, Parameters2 const& parameters2)
|
||||
: m_proj_or_transform(parameters1, parameters2)
|
||||
{}
|
||||
|
||||
template <typename Geometry1, typename Geometry2>
|
||||
inline bool apply(Geometry1 const& g1, Geometry2 & g2) const
|
||||
{
|
||||
return m_proj_or_transform.inverse(g1, g2);
|
||||
}
|
||||
|
||||
private:
|
||||
ProjectionOrTransformation m_proj_or_transform;
|
||||
};
|
||||
|
||||
|
||||
}} // namespace strategy::transform
|
||||
|
||||
}} // namespace boost::geometry
|
||||
|
||||
|
||||
#endif // BOOST_GEOMETRY_STRATEGIES_TRANSFORM_SRS_TRANSFORMER_HPP
|
||||
Reference in New Issue
Block a user