From 9f6eb3e5401dca0c1c05fc48c7ee1bfb45e5ac0b Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut.monseigne@inria.fr>
Date: Wed, 15 Jul 2020 11:23:18 +0200
Subject: [PATCH] :truck: use reset for matrix
---
toolkit/include/toolkit/tools/ovtkMatrix.h | 2 --
toolkit/src/tools/ovtkMatrix.cpp | 6 ------
2 files changed, 8 deletions(-)
diff --git a/toolkit/include/toolkit/tools/ovtkMatrix.h b/toolkit/include/toolkit/tools/ovtkMatrix.h
index 07e8846fd..0adfce16b 100644
--- a/toolkit/include/toolkit/tools/ovtkMatrix.h
+++ b/toolkit/include/toolkit/tools/ovtkMatrix.h
@@ -8,7 +8,6 @@ namespace Matrix {
OVTK_API bool copy(CMatrix& dst, const CMatrix& src);
OVTK_API bool copyDescription(CMatrix& dst, const CMatrix& src);
OVTK_API bool copyContent(CMatrix& dst, const CMatrix& src);
-OVTK_API bool clearContent(CMatrix& matrix);
OVTK_API bool isDescriptionSimilar(const CMatrix& src1, const CMatrix& src2, bool checkLabels = true);
OVTK_API bool isContentSimilar(const CMatrix& src1, const CMatrix& src2);
OVTK_API bool isContentValid(const CMatrix& src, const bool checkNotANumber = true, const bool checkInfinity = true);
@@ -24,7 +23,6 @@ namespace MatrixManipulation {
inline bool copy(CMatrix& dst, const CMatrix& src) { return Matrix::copy(dst, src); }
inline bool copyDescription(CMatrix& dst, const CMatrix& src) { return Matrix::copyDescription(dst, src); }
inline bool copyContent(CMatrix& dst, const CMatrix& src) { return Matrix::copyContent(dst, src); }
-inline bool clearContent(CMatrix& rMatrix) { return Matrix::clearContent(rMatrix); }
} // namespace MatrixManipulation
} // namespace Toolkit
} // namespace OpenViBE
diff --git a/toolkit/src/tools/ovtkMatrix.cpp b/toolkit/src/tools/ovtkMatrix.cpp
index f1b788118..21838ad3d 100644
--- a/toolkit/src/tools/ovtkMatrix.cpp
+++ b/toolkit/src/tools/ovtkMatrix.cpp
@@ -54,12 +54,6 @@ bool Matrix::copyContent(CMatrix& dst, const CMatrix& src)
return true;
}
-bool Matrix::clearContent(CMatrix& matrix)
-{
- memset(matrix.getBuffer(), 0, matrix.getSize() * sizeof(double));
- return true;
-}
-
bool Matrix::isDescriptionSimilar(const CMatrix& src1, const CMatrix& src2, const bool checkLabels)
{
if (&src1 == &src2) { return true; }
--
GitLab