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

102
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++ )
{ cvFree( latestPoints + i );
for( i = 0; i < MAX_CAMERAS; i++ )
cvFree( latestPoints + i );
}
if( type == CV_CALIB_ETALON_USER || type != etalonType ) if( type == CV_CALIB_ETALON_USER || type != etalonType )
{ {
@ -523,64 +520,61 @@ 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] ) CvMat dst_stub, *dst;
int count = 0;
bool found = false;
CvPoint2D32f* pts = 0;
GetLatestPoints( i, &pts, &count, &found );
dst = cvGetMat( dstarr[i], &dst_stub );
static const CvScalar line_colors[] =
{ {
CvMat dst_stub, *dst; {{0,0,255}},
int count = 0; {{0,128,255}},
bool found = false; {{0,200,200}},
CvPoint2D32f* pts = 0; {{0,255,0}},
{{200,200,0}},
{{255,0,0}},
{{255,0,255}}
};
GetLatestPoints( i, &pts, &count, &found ); const int colorCount = sizeof(line_colors)/sizeof(line_colors[0]);
const int r = 4;
CvScalar color = line_colors[0];
CvPoint prev_pt = { 0, 0};
dst = cvGetMat( dstarr[i], &dst_stub ); for( j = 0; j < count; j++ )
{
CvPoint pt;
pt.x = cvRound(pts[j].x);
pt.y = cvRound(pts[j].y);
static const CvScalar line_colors[] = if( found )
{ {
{{0,0,255}}, if( etalonType == CV_CALIB_ETALON_CHESSBOARD )
{{0,128,255}}, color = line_colors[(j/cvRound(etalonParams[0]))%colorCount];
{{0,200,200}}, else
{{0,255,0}}, color = CV_RGB(0,255,0);
{{200,200,0}},
{{255,0,0}},
{{255,0,255}}
};
const int colorCount = sizeof(line_colors)/sizeof(line_colors[0]); if( j != 0 )
const int r = 4; cvLine( dst, prev_pt, pt, color, 1, CV_AA );
CvScalar color = line_colors[0];
CvPoint prev_pt = { 0, 0};
for( j = 0; j < count; j++ )
{
CvPoint pt;
pt.x = cvRound(pts[j].x);
pt.y = cvRound(pts[j].y);
if( found )
{
if( etalonType == CV_CALIB_ETALON_CHESSBOARD )
color = line_colors[(j/cvRound(etalonParams[0]))%colorCount];
else
color = CV_RGB(0,255,0);
if( j != 0 )
cvLine( dst, prev_pt, pt, color, 1, CV_AA );
}
cvLine( dst, cvPoint( pt.x - r, pt.y - r ),
cvPoint( pt.x + r, pt.y + r ), color, 1, CV_AA );
cvLine( dst, cvPoint( pt.x - r, pt.y + r),
cvPoint( pt.x + r, pt.y - r), color, 1, CV_AA );
cvCircle( dst, pt, r+1, color, 1, CV_AA );
prev_pt = pt;
} }
cvLine( dst, cvPoint( pt.x - r, pt.y - r ),
cvPoint( pt.x + r, pt.y + r ), color, 1, CV_AA );
cvLine( dst, cvPoint( pt.x - r, pt.y + r),
cvPoint( pt.x + r, pt.y - r), color, 1, CV_AA );
cvCircle( dst, pt, r+1, color, 1, CV_AA );
prev_pt = pt;
} }
} }
} }