From e64096febe8aa25f6318131042cb5c921233488e Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 6 May 2020 12:00:29 +0200 Subject: [PATCH 1/3] removed unuseful matrix44 copy constructor --- vcg/math/matrix44.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h index 2ea806d6..2dca8aca 100644 --- a/vcg/math/matrix44.h +++ b/vcg/math/matrix44.h @@ -85,7 +85,7 @@ public: */ Matrix44() {} ~Matrix44() {} - Matrix44(const Matrix44 &m); + //Matrix44(const Matrix44 &m); Matrix44(const T v[]); T &ElementAt(const int row, const int col); @@ -243,9 +243,9 @@ typedef Matrix44 Matrix44d; -template Matrix44::Matrix44(const Matrix44 &m) { - memcpy((T *)_a, (const T *)m._a, 16 * sizeof(T)); -} +//template Matrix44::Matrix44(const Matrix44 &m) { +// memcpy((T *)_a, (const T *)m._a, 16 * sizeof(T)); +//} template Matrix44::Matrix44(const T v[]) { memcpy((T *)_a, v, 16 * sizeof(T)); From 59b67d95d37a0e8a70e79bd5bc093332d5c4ba51 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 6 May 2020 15:56:15 +0200 Subject: [PATCH 2/3] removed FacePos and PerMeshAttributeHandle assignment operators --- vcg/complex/base.h | 10 +++++----- vcg/simplex/face/pos.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vcg/complex/base.h b/vcg/complex/base.h index b58baa5c..c2f17442 100644 --- a/vcg/complex/base.h +++ b/vcg/complex/base.h @@ -332,11 +332,11 @@ public: public: PerMeshAttributeHandle(){_handle=NULL;} PerMeshAttributeHandle(void *ah,const int & n):_handle ( (Attribute *)ah ),n_attr(n){} - PerMeshAttributeHandle operator = ( const PerMeshAttributeHandle & pva){ - _handle = (Attribute *)pva._handle; - n_attr = pva.n_attr; - return (*this); - } + //PerMeshAttributeHandle operator = ( const PerMeshAttributeHandle & pva){ + // _handle = (Attribute *)pva._handle; + // n_attr = pva.n_attr; + // return (*this); + //} Attribute * _handle; int n_attr; diff --git a/vcg/simplex/face/pos.h b/vcg/simplex/face/pos.h index 0f7dedc4..bfc0103f 100644 --- a/vcg/simplex/face/pos.h +++ b/vcg/simplex/face/pos.h @@ -129,12 +129,12 @@ public: } /// Assignment operator - inline PosType & operator = ( const PosType & h ){ - f=h.f; - z=h.z; - v=h.v; - return *this; - } + //inline PosType & operator = ( const PosType & h ){ + // f=h.f; + // z=h.z; + // v=h.v; + // return *this; + //} /// Set to null the half-edge void SetNull(){ From f1a642ad28df3b4cac68c73f355b8a16237e5569 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Tue, 12 May 2020 15:31:58 +0200 Subject: [PATCH 3/3] removed using namespace std from header file --- vcg/complex/algorithms/mesh_to_matrix.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/vcg/complex/algorithms/mesh_to_matrix.h b/vcg/complex/algorithms/mesh_to_matrix.h index 06ff42f6..96e4a2c1 100644 --- a/vcg/complex/algorithms/mesh_to_matrix.h +++ b/vcg/complex/algorithms/mesh_to_matrix.h @@ -28,8 +28,6 @@ #include #include -using namespace std; - namespace vcg { namespace tri { template < typename MeshType >