From 57ef8d67b095d8f356389bab60a2512e3593bc10 Mon Sep 17 00:00:00 2001 From: Bryan Marfito Date: Wed, 21 May 2025 21:55:58 +0800 Subject: [PATCH 1/4] Update SparseMatrix.inl --- CodeExterne/Poisson/include/SparseMatrix.inl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CodeExterne/Poisson/include/SparseMatrix.inl b/CodeExterne/Poisson/include/SparseMatrix.inl index 9bdde69247..615e59a11c 100755 --- a/CodeExterne/Poisson/include/SparseMatrix.inl +++ b/CodeExterne/Poisson/include/SparseMatrix.inl @@ -192,11 +192,11 @@ void SparseMatrix< T >::SetRowSize( int row , int count ) } -template -void SparseMatrix::SetZero() -{ - Resize(this->m_N, this->m_M); -} +// template +// void SparseMatrix::SetZero() +// { +// Resize(this->m_N, this->m_M); +// } template SparseMatrix SparseMatrix::operator * (const T& V) const From 0eb11965b2c24d61c91f94049edce0f030c7212c Mon Sep 17 00:00:00 2001 From: Bryan Marfito Date: Wed, 21 May 2025 21:57:09 +0800 Subject: [PATCH 2/4] Update fixed.h --- include/ext_stl/fixed.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ext_stl/fixed.h b/include/ext_stl/fixed.h index 01639f9616..293c247b67 100755 --- a/include/ext_stl/fixed.h +++ b/include/ext_stl/fixed.h @@ -156,8 +156,8 @@ template class ElPFixed : public ElFixed void AddScalFixed(const ElPFixed & p2, const INT & aScalFixed) { - _x+= ((p2.x*this->aSF)<b2); - _y+= ((p2.y*this->aSF)<b2); + _x+= ((p2.x()*this->aSF())<b2); + _y+= ((p2.y()*this->aSF())<b2); } }; From 5144b9923ed7c7fdaee3994c45774112b9418e13 Mon Sep 17 00:00:00 2001 From: Bryan Marfito Date: Wed, 21 May 2025 21:58:39 +0800 Subject: [PATCH 3/4] Update BufferImage_code.h --- src/TpMMPD/BufferImage_code.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TpMMPD/BufferImage_code.h b/src/TpMMPD/BufferImage_code.h index 0e37f7f612..c53e64b6f8 100755 --- a/src/TpMMPD/BufferImage_code.h +++ b/src/TpMMPD/BufferImage_code.h @@ -393,7 +393,7 @@ BufferImage& BufferImage::operator -= (BufferImage const &img) int NC = _size.first; int NL = _size.second; int NC2,NL2; - img.Size(NC2,NL2); + img.size(NC2,NL2); int nbBands2 = img.numBands(); T* ptrLine = _data; const T* ptrLine2 = img.getPtr(); @@ -434,7 +434,7 @@ BufferImage& BufferImage::operator *= (BufferImage const &img) int NC = _size.first; int NL = _size.second; int NC2,NL2; - img.Size(NC2,NL2); + img.size(NC2,NL2); int nbBands2 = img.numBands(); T* ptrLine = _data; const T* ptrLine2 = img.getPtr(); From 337c5e7d3b458064e3a8fdb413b53924e34263cc Mon Sep 17 00:00:00 2001 From: Bryan Marfito Date: Wed, 21 May 2025 22:07:48 +0800 Subject: [PATCH 4/4] Update Ply.h --- CodeExterne/Poisson/include/Ply.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CodeExterne/Poisson/include/Ply.h b/CodeExterne/Poisson/include/Ply.h index be5760a2e7..dcb0d4f712 100755 --- a/CodeExterne/Poisson/include/Ply.h +++ b/CodeExterne/Poisson/include/Ply.h @@ -340,7 +340,7 @@ class PlyOrientedVertex 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 @@ class PlyColorVertex } _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; }