Merge pull request #25860 from asmorkalov:as/fix_linux_32bit

Fixed 32-bit build with some GCC versions
pull/25869/head
Alexander Smorkalov 7 months ago committed by GitHub
commit 6a11847d57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 7
      modules/3d/src/octree.cpp

@ -410,8 +410,9 @@ void Octree::getPointCloudByOctree(OutputArray restorePointCloud, OutputArray re
double resolution = p->resolution;
std::vector<Point3f> outPts, outColors;
std::stack<std::tuple<Ptr<OctreeNode>, size_t, size_t, size_t>> toCheck;
toCheck.push({root, 0, 0, 0});
typedef std::tuple<Ptr<OctreeNode>, size_t, size_t, size_t> stack_element;
std::stack<stack_element> toCheck;
toCheck.push(stack_element(root, 0, 0, 0));
while (!toCheck.empty())
{
auto top = toCheck.top();
@ -456,7 +457,7 @@ void Octree::getPointCloudByOctree(OutputArray restorePointCloud, OutputArray re
x_copy = (x_copy << 1) | x_offSet;
y_copy = (y_copy << 1) | y_offSet;
z_copy = (z_copy << 1) | z_offSet;
toCheck.push({node->children[i], x_copy, y_copy, z_copy});
toCheck.push(stack_element(node->children[i], x_copy, y_copy, z_copy));
}
}
}

Loading…
Cancel
Save