boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-03 09:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge for Boost.Geometry

Browse Source 
[SVN r76363]
This commit is contained in:
Barend Gehrels
2012-01-08 10:49:28 +00:00
parent 745744df37
commit 47f78e4e05
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/geometry/io/dsv/write.hpp
View File

@@ -1,8 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.

20
include/boost/geometry/multi/algorithms/distance.hpp
View File

@@ -36,6 +36,12 @@ namespace detail { namespace distance
template<typename Geometry, typename MultiGeometry, typename Strategy>
struct distance_single_to_multi
: private dispatch::distance
<
Geometry,
typename range_value<MultiGeometry>::type,
Strategy
>
{
typedef typename strategy::distance::services::return_type<Strategy>::type return_type;
@@ -50,7 +56,13 @@ struct distance_single_to_multi
it != boost::end(multi);
++it)
{
return_type dist = geometry::distance(geometry, *it);
return_type dist = dispatch::distance
<
Geometry,
typename range_value<MultiGeometry>::type,
Strategy
>::apply(geometry, *it, strategy);
if (first || dist < mindist)
{
mindist = dist;
@@ -64,6 +76,12 @@ struct distance_single_to_multi
template<typename Multi1, typename Multi2, typename Strategy>
struct distance_multi_to_multi
: private distance_single_to_multi
<
typename range_value<Multi1>::type,
Multi2,
Strategy
>
{
typedef typename strategy::distance::services::return_type<Strategy>::type return_type;

6
include/boost/geometry/multi/geometries/multi_geometries.hpp
View File

@@ -1,8 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.