From: Jochen Sprickerhof Date: Sun, 23 Feb 2025 07:56:51 +0000 (+0100) Subject: Rediff patches X-Git-Tag: archive/raspbian/1.15.0+dfsg-2+rpi1^2~9 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=55cd7cd8a89c562fd063b2aba8f439ccec1850e5;p=pcl.git Rediff patches --- diff --git a/debian/patches/0001-Fix-PCL_ROOT-path.patch b/debian/patches/0001-Fix-PCL_ROOT-path.patch index 9cfa7b7f..5185aff6 100644 --- a/debian/patches/0001-Fix-PCL_ROOT-path.patch +++ b/debian/patches/0001-Fix-PCL_ROOT-path.patch @@ -7,10 +7,10 @@ Subject: Fix PCL_ROOT path 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index cf21c44..e664080 100644 +index 6e1af47..5da111d 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in -@@ -411,7 +411,7 @@ if(WIN32 AND NOT MINGW) +@@ -395,7 +395,7 @@ if(WIN32 AND NOT MINGW) endif() else() # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y diff --git a/debian/patches/0003-Use-newly-build-libs-when-testing.patch b/debian/patches/0003-Use-newly-build-libs-when-testing.patch index fdfb3159..f13f3fa4 100644 --- a/debian/patches/0003-Use-newly-build-libs-when-testing.patch +++ b/debian/patches/0003-Use-newly-build-libs-when-testing.patch @@ -8,10 +8,10 @@ This exports the LD_LIBRARY_PATH so the newly build libs will be used. 1 file changed, 1 insertion(+) diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake -index 2da076c..a78551a 100644 +index be9da33..9f11b9c 100644 --- a/cmake/pcl_targets.cmake +++ b/cmake/pcl_targets.cmake -@@ -415,6 +415,7 @@ macro(PCL_ADD_TEST _name _exename) +@@ -435,6 +435,7 @@ macro(PCL_ADD_TEST _name _exename) set_target_properties(${_exename} PROPERTIES FOLDER "Tests") add_test(NAME ${_name} COMMAND ${_exename} ${ARGS_ARGUMENTS}) diff --git a/debian/patches/0004-Fix-minor-issues-in-tests.patch b/debian/patches/0004-Fix-minor-issues-in-tests.patch deleted file mode 100644 index 02fe56d3..00000000 --- a/debian/patches/0004-Fix-minor-issues-in-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Markus Vieth -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 // for setw - #include - #include - -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 - #include - #include -+#include // for setprecision - #include - #include - diff --git a/debian/patches/0004-Work-around-test-failing-on-i386.patch b/debian/patches/0004-Work-around-test-failing-on-i386.patch deleted file mode 100644 index 65afd783..00000000 --- a/debian/patches/0004-Work-around-test-failing-on-i386.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Jochen Sprickerhof -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 c_result; - Eigen::Matrix 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) - { diff --git a/debian/patches/0005-Compatibility-with-clang-19.patch b/debian/patches/0005-Compatibility-with-clang-19.patch deleted file mode 100644 index 13fcf491..00000000 --- a/debian/patches/0005-Compatibility-with-clang-19.patch +++ /dev/null @@ -1,104 +0,0 @@ -From: Markus Vieth -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::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 child_center; -+ Real child_width; -+ children[i].centerAndWidth(child_center, child_width); -+ temp=SquareDistance(child_center,p); - if(!i || tempoffset[i] = node.offset[i];} -+ for(i=0;ioff[i] = node.off[i];} - if(node.children){ - initChildren(); - for(i=0;i - int OctNode::CompareForwardDepths(const void* v1,const void* v2){ -- return ((const OctNode*)v1)->depth-((const OctNode*)v2)->depth; -+ return ((const OctNode*)v1)->depth()-((const OctNode*)v2)->depth(); - } - - template< class NodeData , class Real > -@@ -874,7 +877,7 @@ namespace pcl - - template - int OctNode::CompareBackwardDepths(const void* v1,const void* v2){ -- return ((const OctNode*)v2)->depth-((const OctNode*)v1)->depth; -+ return ((const OctNode*)v2)->depth()-((const OctNode*)v1)->depth(); - } - - template -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 - void SparseMatrix::SetZero() - { -- Resize(this->m_N, this->m_M); -+ // copied from operator *= -+ for (int i=0; i - void SparseMatrix::SetIdentity() - { - SetZero(); -- for(int ij=0; ij < Min( this->Rows(), this->Columns() ); ij++) -+ for(int ij=0; ij < std::min( 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; diff --git a/debian/patches/series b/debian/patches/series index 2375c479..a4a2c6b2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ 0001-Fix-PCL_ROOT-path.patch 0003-Use-newly-build-libs-when-testing.patch -0004-Work-around-test-failing-on-i386.patch -0004-Fix-minor-issues-in-tests.patch -0005-Compatibility-with-clang-19.patch