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

Update width to avoid access to private octree members

This commit is contained in:
Jackson Campolattaro 2020-08-04 22:59:06 -04:00
parent d7421812ba
commit d02e2bef1f
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Octree.h
View File

@ -42,6 +42,7 @@ class Direct_octree {
Traits m_traits; Traits m_traits;
std::size_t m_offset; std::size_t m_offset;
std::vector<std::size_t> m_index_map;
Octree m_octree; Octree m_octree;
@ -54,7 +55,7 @@ public:
const Input_iterator &end, const Input_iterator &end,
Point_map &point_map, Point_map &point_map,
std::size_t offset = 0) : std::size_t offset = 0) :
m_octree({begin, end}, point_map), m_octree(m_index_map, point_map),
m_traits(traits), m_traits(traits),
m_offset(offset) { m_offset(offset) {
@ -81,13 +82,19 @@ public:
m_octree.refine(maxLevel, bucketSize); m_octree.refine(maxLevel, bucketSize);
} }
typename Traits::FT width() const { return m_octree.m_side_per_depth[0]; } typename Traits::FT width() const {
return m_octree.bbox(m_octree.root()).xmax() - m_octree.bbox(m_octree.root()).xmin();
}
const Node &locate(const typename Traits::Point_3 &p) const { const Node &locate(const typename Traits::Point_3 &p) const {
return m_octree.locate(p); return m_octree.locate(p);
} }
const Node &root() const { return m_octree.root(); } const Node &root() const { return m_octree.root(); }
typename Traits::Point_3 barycenter(const Node &node) const {
return m_octree.barycenter(node);
}
}; };
template<class Traits> template<class Traits>
@ -138,13 +145,19 @@ public:
std::size_t index(std::size_t i) { return m_index_map[i]; } std::size_t index(std::size_t i) { return m_index_map[i]; }
typename Traits::FT width() const { return m_octree.m_side_per_depth[0]; } typename Traits::FT width() const {
return m_octree.bbox(m_octree.root()).xmax() - m_octree.bbox(m_octree.root()).xmin();
}
const Node &locate(const typename Traits::Point_3 &p) const { const Node &locate(const typename Traits::Point_3 &p) const {
return m_octree.locate(p); return m_octree.locate(p);
} }
const Node &root() const { return m_octree.root(); } const Node &root() const { return m_octree.root(); }
typename Traits::Point_3 barycenter(const Node &node) const {
return m_octree.barycenter(node);
}
}; };
} }