From b903776e0caf8f9eac65c46d24d33e56b81e1933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Fri, 7 May 2010 16:23:47 +0200 Subject: [PATCH] Estimation DLL: fixed type errors in VDVEigDecomposition class --- mex/sources/estimation/libmat/VDVEigDecomposition.hh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mex/sources/estimation/libmat/VDVEigDecomposition.hh b/mex/sources/estimation/libmat/VDVEigDecomposition.hh index 54e08e63d..b22c4c6d0 100644 --- a/mex/sources/estimation/libmat/VDVEigDecomposition.hh +++ b/mex/sources/estimation/libmat/VDVEigDecomposition.hh @@ -33,7 +33,7 @@ class VDVEigDecomposition { lapack_int lda, n; - int lwork, info; + lapack_int lwork, info; double tmpwork; double *work; bool converged; @@ -45,9 +45,9 @@ public: class VDVEigException { public: - const int info; + const lapack_int info; std::string message; - VDVEigException(int info_arg, std::string message_arg) : + VDVEigException(lapack_int info_arg, std::string message_arg) : info(info_arg), message(message_arg) { }; }; @@ -101,12 +101,12 @@ VDVEigDecomposition::calculate(const Mat &m) throw(VDVEigException) if (m.getCols() != (size_t) n || m.getLd() != (size_t) lda) throw(VDVEigException(info, "Matrix not matching VDVEigDecomposition class")); - int tmplwork = -1; + lapack_int tmplwork = -1; V = m; dsyev("V", "U", &n, V.getData(), &lda, D.getData(), &tmpwork, &tmplwork, &info); - if (lwork < (int) tmpwork) + if (lwork < tmpwork) { - lwork = (int) tmpwork; + lwork = tmpwork; delete[] work; work = new double[lwork]; }