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

Fix tautologies in calibfilter.cpp which cause a build failure when using -Werror=address with clang-3.5

Browse Source 
http://code.opencv.org/issues/4048

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2014-12-05 10:22:11 -08:00
parent c5b6c0456d
commit 35f96d6da7
1 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/legacy/src/calibfilter.cpp
View File

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