[packages/pcl] Release 4; upstream template fixes
arekm
arekm at pld-linux.org
Sun Sep 27 22:29:28 CEST 2026
commit 3663fa4b114e9f965fa04e1eb1ab01519e0974af
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Sep 27 22:28:35 2026 +0200
Release 4; upstream template fixes
gcc15.patch | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pcl.spec | 4 ++-
2 files changed, 108 insertions(+), 1 deletion(-)
---
diff --git a/pcl.spec b/pcl.spec
index d4a54b8..daa00ac 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -11,7 +11,7 @@ Summary: Point Cloud Library - library for point cloud processing
Summary(pl.UTF-8): Point Cloud Library - biblioteka do operacji na chmurze punktów
Name: pcl
Version: 1.14.1
-Release: 3
+Release: 4
License: BSD
Group: Libraries
#Source0Download: http://pointclouds.org/downloads/
@@ -21,6 +21,7 @@ Patch0: oom.patch
Patch1: sphinx.patch
Patch2: boost-1.87.patch
Patch3: boost-hash.patch
+Patch4: gcc15.patch
URL: http://pointclouds.org/
BuildRequires: OpenGL-devel
BuildRequires: OpenGL-GLU-devel
@@ -119,6 +120,7 @@ Dokumentacja API oraz wprowadzenie do biblioteki PCL.
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -p1
+%patch -P 4 -p1
%build
mkdir -p build
diff --git a/gcc15.patch b/gcc15.patch
new file mode 100644
index 0000000..c99a46e
--- /dev/null
+++ b/gcc15.patch
@@ -0,0 +1,105 @@
+From 6f1105a4c30416a55196db048ef9759e22cdd04e Mon Sep 17 00:00:00 2001
+From: Markus Vieth <mvieth at techfak.uni-bielefeld.de>
+Date: Thu, 22 Aug 2024 20:48:19 +0200
+Subject: [PATCH] Compatibility with clang-19
+
+---
+ .../registration/correspondence_rejection_features.h | 6 +++---
+ .../pcl/surface/3rdparty/poisson4/octree_poisson.hpp | 11 +++++++----
+ .../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 44835c379fc..f3bab8fef01 100644
+--- a/registration/include/pcl/registration/correspondence_rejection_features.h
++++ b/registration/include/pcl/registration/correspondence_rejection_features.h
+@@ -269,9 +269,9 @@ class PCL_EXPORTS CorrespondenceRejectorFeatures : public CorrespondenceRejector
+ // 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 7ed8aaf9d82..e7f45b650e9 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 24f0a5402c5..5e54ac7862d 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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pcl.git/commitdiff/3663fa4b114e9f965fa04e1eb1ab01519e0974af
More information about the pld-cvs-commit
mailing list