+++ /dev/null
-From: Markus Vieth <mvieth@techfak.uni-bielefeld.de>
-Date: Tue, 9 Apr 2024 21:00:36 +0200
-Subject: Fix minor issues in tests
-
----
- test/geometry/test_mesh_common_functions.h | 1 +
- test/io/test_io.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/test/geometry/test_mesh_common_functions.h b/test/geometry/test_mesh_common_functions.h
-index 5f3d42f..0579b99 100644
---- a/test/geometry/test_mesh_common_functions.h
-+++ b/test/geometry/test_mesh_common_functions.h
-@@ -40,6 +40,7 @@
-
- #pragma once
-
-+#include <iomanip> // for setw
- #include <iostream>
- #include <vector>
-
-diff --git a/test/io/test_io.cpp b/test/io/test_io.cpp
-index 53438b2..be2f83c 100644
---- a/test/io/test_io.cpp
-+++ b/test/io/test_io.cpp
-@@ -49,6 +49,7 @@
- #include <pcl/io/ascii_io.h>
- #include <pcl/io/obj_io.h>
- #include <fstream>
-+#include <iomanip> // for setprecision
- #include <locale>
- #include <stdexcept>
-
+++ /dev/null
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Sat, 6 Jan 2024 11:27:46 +0100
-Subject: Work around test failing on i386
-
----
- test/common/test_eigen.cpp | 2 +-
- test/octree/test_octree.cpp | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/common/test_eigen.cpp b/test/common/test_eigen.cpp
-index 6bcc4ae..ae42a58 100644
---- a/test/common/test_eigen.cpp
-+++ b/test/common/test_eigen.cpp
-@@ -537,7 +537,7 @@ TEST (PCL, eigen22f)
- Eigen::Matrix<Scalar, 2, 2> c_result;
- Eigen::Matrix<Scalar, 2, 2> c_error;
-
-- constexpr Scalar epsilon = 3.1e-5f;
-+ constexpr Scalar epsilon = 3.1e-3f;
- constexpr unsigned iterations = 1000000;
-
- // test floating point row-major : row-major
-diff --git a/test/octree/test_octree.cpp b/test/octree/test_octree.cpp
-index 7fbd7bb..99e3346 100644
---- a/test/octree/test_octree.cpp
-+++ b/test/octree/test_octree.cpp
-@@ -922,6 +922,7 @@ TEST (PCL, Octree_Pointcloud_Iterator_Test)
- ASSERT_EQ (octreeA.getBranchCount (), branchNodeCount);
- }
-
-+#ifndef __i386__
- TEST(PCL, Octree_Pointcloud_Occupancy_Test)
- {
- constexpr unsigned int test_runs = 100;
-@@ -1021,6 +1022,7 @@ TEST (PCL, Octree_Pointcloud_Change_Detector_Test)
- ASSERT_GE (newPointIdxVector[i], 1000);
- }
- }
-+#endif
-
- TEST (PCL, Octree_Pointcloud_Voxel_Centroid_Test)
- {
+++ /dev/null
-From: Markus Vieth <mvieth@techfak.uni-bielefeld.de>
-Date: Thu, 22 Aug 2024 20:48:19 +0200
-Subject: Compatibility with clang-19
-
----
- .../pcl/registration/correspondence_rejection_features.h | 6 +++---
- .../include/pcl/surface/3rdparty/poisson4/octree_poisson.hpp | 11 +++++++----
- .../include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp | 10 +++++++---
- 3 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/registration/include/pcl/registration/correspondence_rejection_features.h b/registration/include/pcl/registration/correspondence_rejection_features.h
-index 44835c3..f3bab8f 100644
---- a/registration/include/pcl/registration/correspondence_rejection_features.h
-+++ b/registration/include/pcl/registration/correspondence_rejection_features.h
-@@ -269,9 +269,9 @@ protected:
- // Check if the representations are valid
- if (!feature_representation_->isValid(feat_src) ||
- !feature_representation_->isValid(feat_tgt)) {
-- PCL_ERROR("[pcl::registration::%s::getCorrespondenceScore] Invalid feature "
-- "representation given!\n",
-- this->getClassName().c_str());
-+ PCL_ERROR(
-+ "[pcl::registration::CorrespondenceRejectorFeatures::FeatureContainer::"
-+ "getCorrespondenceScore] Invalid feature representation given!\n");
- return (std::numeric_limits<double>::max());
- }
-
-diff --git a/surface/include/pcl/surface/3rdparty/poisson4/octree_poisson.hpp b/surface/include/pcl/surface/3rdparty/poisson4/octree_poisson.hpp
-index 7ed8aaf..e7f45b6 100644
---- a/surface/include/pcl/surface/3rdparty/poisson4/octree_poisson.hpp
-+++ b/surface/include/pcl/surface/3rdparty/poisson4/octree_poisson.hpp
-@@ -746,7 +746,10 @@ namespace pcl
- Real temp,dist2;
- if(!children){return this;}
- for(int i=0;i<Cube::CORNERS;i++){
-- temp=SquareDistance(children[i].center,p);
-+ Point3D<Real> child_center;
-+ Real child_width;
-+ children[i].centerAndWidth(child_center, child_width);
-+ temp=SquareDistance(child_center,p);
- if(!i || temp<dist2){
- dist2=temp;
- nearest=i;
-@@ -807,7 +810,7 @@ namespace pcl
- children=NULL;
-
- d=node.depth ();
-- for(i=0;i<DIMENSION;i++){this->offset[i] = node.offset[i];}
-+ for(i=0;i<DIMENSION;i++){this->off[i] = node.off[i];}
- if(node.children){
- initChildren();
- for(i=0;i<Cube::CORNERS;i++){children[i] = node.children[i];}
-@@ -817,7 +820,7 @@ namespace pcl
-
- template <class NodeData,class Real>
- int OctNode<NodeData,Real>::CompareForwardDepths(const void* v1,const void* v2){
-- return ((const OctNode<NodeData,Real>*)v1)->depth-((const OctNode<NodeData,Real>*)v2)->depth;
-+ return ((const OctNode<NodeData,Real>*)v1)->depth()-((const OctNode<NodeData,Real>*)v2)->depth();
- }
-
- template< class NodeData , class Real >
-@@ -874,7 +877,7 @@ namespace pcl
-
- template <class NodeData,class Real>
- int OctNode<NodeData,Real>::CompareBackwardDepths(const void* v1,const void* v2){
-- return ((const OctNode<NodeData,Real>*)v2)->depth-((const OctNode<NodeData,Real>*)v1)->depth;
-+ return ((const OctNode<NodeData,Real>*)v2)->depth()-((const OctNode<NodeData,Real>*)v1)->depth();
- }
-
- template <class NodeData,class Real>
-diff --git a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp
-index 24f0a54..5e54ac7 100644
---- a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp
-+++ b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp
-@@ -228,14 +228,18 @@ namespace pcl
- template<class T>
- void SparseMatrix<T>::SetZero()
- {
-- Resize(this->m_N, this->m_M);
-+ // copied from operator *=
-+ for (int i=0; i<rows; i++)
-+ {
-+ for(int ii=0;ii<rowSizes[i];ii++){m_ppElements[i][ii].Value=T(0);}
-+ }
- }
-
- template<class T>
- void SparseMatrix<T>::SetIdentity()
- {
- SetZero();
-- for(int ij=0; ij < Min( this->Rows(), this->Columns() ); ij++)
-+ for(int ij=0; ij < std::min<int>( rows, _maxEntriesPerRow ); ij++)
- (*this)(ij,ij) = T(1);
- }
-
-@@ -388,7 +392,7 @@ namespace pcl
- T alpha,beta,rDotR;
- int i;
-
-- solution.Resize(M.Columns());
-+ solution.Resize(bb.Dimensions());
- solution.SetZero();
-
- d=r=bb;
projects / pcl.git / commitdiff