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

Merge branch 'releases/CGAL-4.8-branch'

This commit is contained in:
Laurent Rineau 2016-03-31 12:35:23 +02:00
parent ae33af9222 bb19fbdcde
commit 836ce61d39
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
View File

@ -298,12 +298,14 @@ shape. The implementation follows \cgalCite{schnabel2007efficient}.
m_direct_octrees[s] = new Direct_octree( m_direct_octrees[s] = new Direct_octree(
m_traits, last + 1, m_traits, last + 1,
last + subsetSize + 1, last + subsetSize + 1,
m_point_pmap, m_normal_pmap,
remainingPoints - subsetSize); remainingPoints - subsetSize);
} }
else else
m_direct_octrees[0] = new Direct_octree( m_direct_octrees[0] = new Direct_octree(
m_traits, m_input_iterator_first, m_traits, m_input_iterator_first,
m_input_iterator_first + (subsetSize), m_input_iterator_first + (subsetSize),
m_point_pmap, m_normal_pmap,
0); 0);
m_available_octree_sizes[s] = subsetSize; m_available_octree_sizes[s] = subsetSize;
@ -313,7 +315,8 @@ shape. The implementation follows \cgalCite{schnabel2007efficient}.
} }
m_global_octree = new Indexed_octree( m_global_octree = new Indexed_octree(
m_traits, m_input_iterator_first, m_input_iterator_beyond); m_traits, m_input_iterator_first, m_input_iterator_beyond,
m_point_pmap, m_normal_pmap);
m_global_octree->createTree(); m_global_octree->createTree();
return true; return true;

6
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Octree.h
View File

@ -235,6 +235,8 @@ namespace CGAL {
Octree(Sd_traits const& traits, Octree(Sd_traits const& traits,
const Input_iterator &first, const Input_iterator &first,
const Input_iterator &beyond, const Input_iterator &beyond,
Point_map& point_pmap,
Normal_map& normal_pmap,
std::size_t offset = 0, std::size_t offset = 0,
std::size_t bucketSize = 20, std::size_t bucketSize = 20,
std::size_t maxLevel = 10) std::size_t maxLevel = 10)
@ -242,7 +244,9 @@ namespace CGAL {
m_traits(traits), m_traits(traits),
m_root(NULL), m_root(NULL),
m_bucket_size(bucketSize), m_bucket_size(bucketSize),
m_set_max_level(maxLevel) {} m_set_max_level(maxLevel),
m_point_pmap (point_pmap),
m_normal_pmap (normal_pmap) {}
~Octree() { ~Octree() {
if (!m_root) if (!m_root)