Control: tags 1096453 + patch Control: tags 1096453 + pending Dear maintainer,
I've prepared an NMU for colmap (versioned as 3.10-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for colmap-3.10 colmap-3.10 changelog | 7 +++++++ patches/gcc-15.patch | 36 ++++++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 44 insertions(+) diff -Nru colmap-3.10/debian/changelog colmap-3.10/debian/changelog --- colmap-3.10/debian/changelog 2025-04-17 10:10:57.000000000 +0300 +++ colmap-3.10/debian/changelog 2025-09-21 11:50:42.000000000 +0300 @@ -1,3 +1,10 @@ +colmap (3.10-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with GCC 15. (Closes: #1096453) + + -- Adrian Bunk <[email protected]> Sun, 21 Sep 2025 11:50:42 +0300 + colmap (3.10-2) unstable; urgency=medium * d/README.source: updated. diff -Nru colmap-3.10/debian/patches/gcc-15.patch colmap-3.10/debian/patches/gcc-15.patch --- colmap-3.10/debian/patches/gcc-15.patch 1970-01-01 02:00:00.000000000 +0200 +++ colmap-3.10/debian/patches/gcc-15.patch 2025-09-21 11:50:42.000000000 +0300 @@ -0,0 +1,36 @@ +Description: Fix FTBFS with GCC 15 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1096453 +Origin: upstream, https://github.com/colmap/colmap/commit/203bf36c2d5e805f0eb26d8b7a2b8572e7b134e1 + +--- colmap-3.10.orig/src/thirdparty/PoissonRecon/Ply.h ++++ colmap-3.10/src/thirdparty/PoissonRecon/Ply.h +@@ -340,7 +340,7 @@ public: + PlyOrientedVertex( void ) { ; } + PlyOrientedVertex( Point3D< Real > p , Point3D< Real > n ) : point(p) , normal(n) { ; } + PlyOrientedVertex operator + ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point+p.point , normal+p.normal ); } +- PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.value , normal-p.normal ); } ++ PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.point , normal-p.normal ); } + template< class _Real > PlyOrientedVertex operator * ( _Real s ) const { return PlyOrientedVertex( point*s , normal*s ); } + template< class _Real > PlyOrientedVertex operator / ( _Real s ) const { return PlyOrientedVertex( point/s , normal/s ); } + PlyOrientedVertex& operator += ( PlyOrientedVertex p ) { point += p.point , normal += p.normal ; return *this; } +@@ -386,7 +386,7 @@ public: + } + + _PlyColorVertex operator + ( _PlyColorVertex p ) const { return _PlyColorVertex( point+p.point , color+p.color ); } +- _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.value , color-p.color ); } ++ _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.point , color-p.color ); } + template< class _Real > _PlyColorVertex operator * ( _Real s ) const { return _PlyColorVertex( point*s , color*s ); } + template< class _Real > _PlyColorVertex operator / ( _Real s ) const { return _PlyColorVertex( point/s , color/s ); } + _PlyColorVertex& operator += ( _PlyColorVertex p ) { point += p.point , color += p.color ; return *this; } +--- colmap-3.10.orig/src/thirdparty/PoissonRecon/SparseMatrix.inl ++++ colmap-3.10/src/thirdparty/PoissonRecon/SparseMatrix.inl +@@ -195,7 +195,7 @@ void SparseMatrix< T >::SetRowSize( int + template<class T> + void SparseMatrix<T>::SetZero() + { +- Resize(this->m_N, this->m_M); ++ Resize(this->rows, this->_maxEntriesPerRow); + } + + template<class T> diff -Nru colmap-3.10/debian/patches/series colmap-3.10/debian/patches/series --- colmap-3.10/debian/patches/series 2024-07-24 23:59:29.000000000 +0300 +++ colmap-3.10/debian/patches/series 2025-09-21 11:50:42.000000000 +0300 @@ -2,3 +2,4 @@ #baseline-patch-bunk #recommended-gui-patch #gh-pr-2338 +gcc-15.patch
