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

Reduce variables scope

Browse Source
This commit is contained in:
Dmitry-Me
2016-02-01 11:10:13 +03:00
parent a4692a0da5
commit bf604f1780
3 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/calib3d/src/ptsetreg.cpp
View File

@@ -206,7 +206,7 @@ public:
for( iter = 0; iter < niters; iter++ )
{
int i, goodCount, nmodels;
int i, nmodels;
if( count > modelPoints )
{
bool found = getSubset( m1, m2, ms1, ms2, rng, 10000 );
@@ -227,7 +227,7 @@ public:
for( i = 0; i < nmodels; i++ )
{
Mat model_i = model.rowRange( i*modelSize.height, (i+1)*modelSize.height );
goodCount = findInliers( m1, m2, model_i, err, mask, threshold );
int goodCount = findInliers( m1, m2, model_i, err, mask, threshold );
if( goodCount > MAX(maxGoodCount, modelPoints-1) )
{
@@ -284,7 +284,7 @@ public:
int d1 = m1.channels() > 1 ? m1.channels() : m1.cols;
int d2 = m2.channels() > 1 ? m2.channels() : m2.cols;
int count = m1.checkVector(d1), count2 = m2.checkVector(d2);
double minMedian = DBL_MAX, sigma;
double minMedian = DBL_MAX;
RNG rng((uint64)-1);
@@ -359,7 +359,7 @@ public:
if( minMedian < DBL_MAX )
{
sigma = 2.5*1.4826*(1 + 5./(count - modelPoints))*std::sqrt(minMedian);
double sigma = 2.5*1.4826*(1 + 5./(count - modelPoints))*std::sqrt(minMedian);
sigma = MAX( sigma, 0.001 );
count = findInliers( m1, m2, bestModel, err, mask, sigma );