Merge pull request #3488 from jeremyhu:PR-4048

This commit is contained in:
Vadim Pisarevsky 2014-12-06 08:03:56 +00:00
commit 3481c1caec

View File

@ -95,11 +95,8 @@ bool CvCalibFilter::SetEtalon( CvCalibEtalonType type, double* params,
Stop();
if (latestPoints != NULL)
{
for( i = 0; i < MAX_CAMERAS; i++ )
cvFree( latestPoints + i );
}
if( type == CV_CALIB_ETALON_USER || type != etalonType )
{
@ -523,8 +520,6 @@ void CvCalibFilter::DrawPoints( CvMat** dstarr )
return;
}
if( latestCounts )
{
for( i = 0; i < cameraCount; i++ )
{
if( dstarr[i] && latestCounts[i] )
@ -584,7 +579,6 @@ void CvCalibFilter::DrawPoints( CvMat** dstarr )
}
}
}
}
/* Get total number of frames and already accepted pair of frames */