mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 11:03:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3492 from Dmitry-Me:reduceVariablesScope1

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-12-09 14:05:35 +00:00
commit 10dc5a3759
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,7 +256,6 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
*out_corner_count = 0; *out_corner_count = 0;
IplImage _img; IplImage _img;
int check_chessboard_result;
int quad_count = 0, group_idx = 0, dilations = 0; int quad_count = 0, group_idx = 0, dilations = 0;
img = cvGetMat( img, &stub ); img = cvGetMat( img, &stub );
@ -302,7 +301,7 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
if( flags & CV_CALIB_CB_FAST_CHECK) if( flags & CV_CALIB_CB_FAST_CHECK)
{ {
cvGetImage(img, &_img); cvGetImage(img, &_img);
check_chessboard_result = cvCheckChessboard(&_img, pattern_size); int check_chessboard_result = cvCheckChessboard(&_img, pattern_size);
if(check_chessboard_result <= 0) if(check_chessboard_result <= 0)
{ {
return 0; return 0;
@ -1144,7 +1143,6 @@ icvCleanFoundConnectedQuads( int quad_count, CvCBQuad **quad_group, CvSize patte
{ {
double min_box_area = DBL_MAX; double min_box_area = DBL_MAX;
int skip, min_box_area_index = -1; int skip, min_box_area_index = -1;
CvCBQuad *q0, *q;
// For each point, calculate box area without that point // For each point, calculate box area without that point
for( skip = 0; skip < quad_count; skip++ ) for( skip = 0; skip < quad_count; skip++ )
@ -1166,12 +1164,12 @@ icvCleanFoundConnectedQuads( int quad_count, CvCBQuad **quad_group, CvSize patte
cvClearMemStorage( temp_storage ); cvClearMemStorage( temp_storage );
} }
q0 = quad_group[min_box_area_index]; CvCBQuad *q0 = quad_group[min_box_area_index];
// remove any references to this quad as a neighbor // remove any references to this quad as a neighbor
for( i = 0; i < quad_count; i++ ) for( i = 0; i < quad_count; i++ )
{ {
q = quad_group[i]; CvCBQuad *q = quad_group[i];
for( j = 0; j < 4; j++ ) for( j = 0; j < 4; j++ )
{ {
if( q->neighbors[j] == q0 ) if( q->neighbors[j] == q0 )