Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CodeExterne/Poisson/include/Ply.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down Expand Up @@ -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; }
Expand Down
10 changes: 5 additions & 5 deletions CodeExterne/Poisson/include/SparseMatrix.inl
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ void SparseMatrix< T >::SetRowSize( int row , int count )
}


template<class T>
void SparseMatrix<T>::SetZero()
{
Resize(this->m_N, this->m_M);
}
// template<class T>
// void SparseMatrix<T>::SetZero()
// {
// Resize(this->m_N, this->m_M);
// }

template<class T>
SparseMatrix<T> SparseMatrix<T>::operator * (const T& V) const
Expand Down
4 changes: 2 additions & 2 deletions include/ext_stl/fixed.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ template <const INT b> class ElPFixed : public ElFixed<b>

void AddScalFixed(const ElPFixed<b> & p2, const INT & aScalFixed)
{
_x+= ((p2.x*this->aSF)<<this->b2);
_y+= ((p2.y*this->aSF)<<this->b2);
_x+= ((p2.x()*this->aSF())<<this->b2);
_y+= ((p2.y()*this->aSF())<<this->b2);
}

};
Expand Down
4 changes: 2 additions & 2 deletions src/TpMMPD/BufferImage_code.h
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ BufferImage<T>& BufferImage<T>::operator -= (BufferImage<T> 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();
Expand Down Expand Up @@ -434,7 +434,7 @@ BufferImage<T>& BufferImage<T>::operator *= (BufferImage<T> 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();
Expand Down