generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3873 from Dmitry-Me:reduceVariableScope10

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-03-30 17:20:39 +00:00
commit 864b4e3b26
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/pca.cpp
View File

@ -66,7 +66,7 @@ PCA& PCA::operator()(InputArray _data, InputArray __mean, int flags, int maxComp
{ {
Mat data = _data.getMat(), _mean = __mean.getMat(); Mat data = _data.getMat(), _mean = __mean.getMat();
int covar_flags = CV_COVAR_SCALE; int covar_flags = CV_COVAR_SCALE;
int i, len, in_count; int len, in_count;
Size mean_sz; Size mean_sz;
CV_Assert( data.channels() == 1 ); CV_Assert( data.channels() == 1 );
@ -131,6 +131,7 @@ PCA& PCA::operator()(InputArray _data, InputArray __mean, int flags, int maxComp
eigenvectors = evects1; eigenvectors = evects1;
// normalize eigenvectors // normalize eigenvectors
int i;
for( i = 0; i < out_count; i++ ) for( i = 0; i < out_count; i++ )
{ {
Mat vec = eigenvectors.row(i); Mat vec = eigenvectors.row(i);
@ -202,7 +203,7 @@ PCA& PCA::operator()(InputArray _data, InputArray __mean, int flags, double reta
{ {
Mat data = _data.getMat(), _mean = __mean.getMat(); Mat data = _data.getMat(), _mean = __mean.getMat();
int covar_flags = CV_COVAR_SCALE; int covar_flags = CV_COVAR_SCALE;
int i, len, in_count; int len, in_count;
Size mean_sz; Size mean_sz;
CV_Assert( data.channels() == 1 ); CV_Assert( data.channels() == 1 );
@ -266,6 +267,7 @@ PCA& PCA::operator()(InputArray _data, InputArray __mean, int flags, double reta
eigenvectors = evects1; eigenvectors = evects1;
// normalize all eigenvectors // normalize all eigenvectors
int i;
for( i = 0; i < eigenvectors.rows; i++ ) for( i = 0; i < eigenvectors.rows; i++ )
{ {
Mat vec = eigenvectors.row(i); Mat vec = eigenvectors.row(i);