mirror of https://github.com/CGAL/cgal
Use const accessor everywhere root is used
This commit is contained in:
parent
eec45bc2b0
commit
32541f0074
|
|
@ -741,7 +741,7 @@ public:
|
||||||
num_invalid++;
|
num_invalid++;
|
||||||
|
|
||||||
for (std::size_t j = 0; j < m_num_subsets; j++) {
|
for (std::size_t j = 0; j < m_num_subsets; j++) {
|
||||||
if (m_direct_octrees[j] && m_direct_octrees[j]->m_root) {
|
if (m_direct_octrees[j] && m_direct_octrees[j]->root()) {
|
||||||
std::size_t offset = m_direct_octrees[j]->offset();
|
std::size_t offset = m_direct_octrees[j]->offset();
|
||||||
|
|
||||||
if (offset <= indices_points_best_candidate.at(i) &&
|
if (offset <= indices_points_best_candidate.at(i) &&
|
||||||
|
|
@ -1022,11 +1022,11 @@ private:
|
||||||
|
|
||||||
typedef typename internal::Octree<PointAccessor>::Cell Cell;
|
typedef typename internal::Octree<PointAccessor>::Cell Cell;
|
||||||
|
|
||||||
std::stack<Cell *> stack;
|
std::stack<const Cell *> stack;
|
||||||
stack.push(octree->m_root);
|
stack.push(octree->root());
|
||||||
|
|
||||||
while (!stack.empty()) {
|
while (!stack.empty()) {
|
||||||
Cell *cell = stack.top();
|
const Cell *cell = stack.top();
|
||||||
stack.pop();
|
stack.pop();
|
||||||
|
|
||||||
FT width = octree->m_width / (1 << (cell->level));
|
FT width = octree->m_width / (1 << (cell->level));
|
||||||
|
|
@ -1074,7 +1074,7 @@ private:
|
||||||
typedef typename internal::Octree<PointAccessor>::Cell Cell;
|
typedef typename internal::Octree<PointAccessor>::Cell Cell;
|
||||||
|
|
||||||
bool upperZ, upperY, upperX;
|
bool upperZ, upperY, upperX;
|
||||||
Cell *cur = octree->m_root;
|
const Cell *cur = octree->root();
|
||||||
|
|
||||||
while (cur && cur->level < level) {
|
while (cur && cur->level < level) {
|
||||||
upperX = cur->center.x() <= p.x();
|
upperX = cur->center.x() <= p.x();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue