songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2669 from sloriot/PSP-estimate_scale_pmap_reference 

Use reference type of the pmap
This commit is contained in:
Laurent Rineau 2017-12-19 16:13:43 +01:00
parent 5578d9bdd5 082d9005da
commit 37efd9fdfd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Point_set_processing_3/include/CGAL/estimate_scale.h
View File

@ -70,7 +70,8 @@ class Quick_multiscale_approximate_knn_distance<Kernel, typename Kernel::Point_3
{
PointPMap point_pmap;
Pmap_unary_function (PointPMap point_pmap) : point_pmap (point_pmap) { }
const typename Kernel::Point_3& operator() (const ValueType& v) const { return get(point_pmap, v); }
typename boost::property_traits<PointPMap>::reference
operator() (const ValueType& v) const { return get(point_pmap, v); }
};
std::size_t m_cluster_size;
@ -226,7 +227,8 @@ class Quick_multiscale_approximate_knn_distance<Kernel, typename Kernel::Point_2
{
PointPMap point_pmap;
Pmap_unary_function (PointPMap point_pmap) : point_pmap (point_pmap) { }
const typename Kernel::Point_2& operator() (const ValueType& v) const { return get(point_pmap, v); }
typename boost::property_traits<PointPMap>::reference
operator() (const ValueType& v) const { return get(point_pmap, v); }
};
template <typename PointPMap>
@ -242,7 +244,8 @@ class Quick_multiscale_approximate_knn_distance<Kernel, typename Kernel::Point_2
: point_pmap (point_pmap) { }
friend inline value_type get (const Pmap_to_3d& ppmap, key_type i)
{
typename Kernel::Point_2 p2 = get(ppmap.point_pmap, i);
typename boost::property_traits<PointPMap>::reference
p2 = get(ppmap.point_pmap, i);
return value_type (p2.x(), p2.y(), 0.);
}
@ -367,7 +370,8 @@ public:
FT nb = 0.;
std::size_t index = 0;
const typename Kernel::Point_2& pquery = get(point_pmap, *query);
typename boost::property_traits<PointPMap>::reference
pquery = get(point_pmap, *query);
for (std::size_t t = 0; t < m_point_sets.size(); ++ t)
{
std::size_t size = ((t == m_point_sets.size() - 1)