mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14207 from alalek:fix_leak_eigenvalue_decomposition

Browse Source
This commit is contained in:
Alexander Alekhin 2019-04-01 14:17:37 +00:00
commit 45169577ca
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/lda.cpp
View File

@ -903,19 +903,19 @@ public:
// given in src. This function is a port of the EigenvalueSolver in JAMA, // given in src. This function is a port of the EigenvalueSolver in JAMA,
// which has been released to public domain by The MathWorks and the // which has been released to public domain by The MathWorks and the
// National Institute of Standards and Technology (NIST). // National Institute of Standards and Technology (NIST).
EigenvalueDecomposition(InputArray src, bool fallbackSymmetric = true) : EigenvalueDecomposition() :
n(0), n(0),
d(NULL), e(NULL), ort(NULL), d(NULL), e(NULL), ort(NULL),
V(NULL), H(NULL) V(NULL), H(NULL)
{ {
compute(src, fallbackSymmetric); // nothing
} }
// This function computes the Eigenvalue Decomposition for a general matrix // This function computes the Eigenvalue Decomposition for a general matrix
// given in src. This function is a port of the EigenvalueSolver in JAMA, // given in src. This function is a port of the EigenvalueSolver in JAMA,
// which has been released to public domain by The MathWorks and the // which has been released to public domain by The MathWorks and the
// National Institute of Standards and Technology (NIST). // National Institute of Standards and Technology (NIST).
void compute(InputArray src, bool fallbackSymmetric) void compute(InputArray src, bool fallbackSymmetric = true)
{ {
CV_INSTRUMENT_REGION(); CV_INSTRUMENT_REGION();
@ -970,7 +970,8 @@ void eigenNonSymmetric(InputArray _src, OutputArray _evals, OutputArray _evects)
else else
src64f = src; src64f = src;
EigenvalueDecomposition eigensystem(src64f, false); EigenvalueDecomposition eigensystem;
eigensystem.compute(src64f, false);
// EigenvalueDecomposition returns transposed and non-sorted eigenvalues // EigenvalueDecomposition returns transposed and non-sorted eigenvalues
std::vector<double> eigenvalues64f; std::vector<double> eigenvalues64f;
@ -1146,7 +1147,8 @@ void LDA::lda(InputArrayOfArrays _src, InputArray _lbls) {
// M = inv(Sw)*Sb // M = inv(Sw)*Sb
Mat M; Mat M;
gemm(Swi, Sb, 1.0, Mat(), 0.0, M); gemm(Swi, Sb, 1.0, Mat(), 0.0, M);
EigenvalueDecomposition es(M); EigenvalueDecomposition es;
es.compute(M);
_eigenvalues = es.eigenvalues(); _eigenvalues = es.eigenvalues();
_eigenvectors = es.eigenvectors(); _eigenvectors = es.eigenvectors();
// reshape eigenvalues, so they are stored by column // reshape eigenvalues, so they are stored by column