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

Merge pull request #12574 from alalek:fixes_master

Browse Source
This commit is contained in:
Alexander Alekhin 2018-09-18 11:16:24 +00:00
commit 145d3ba99d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/calib3d/src/chessboard.cpp
View File

@ -2557,6 +2557,7 @@ std::vector<cv::Point2f> Chessboard::Board::getContour()const
last = 1; last = 1;
break; break;
} }
/* fallthrough */
case 2: // right case 2: // right
if(iter.right(true)) if(iter.right(true))
{ {
@ -2566,6 +2567,7 @@ std::vector<cv::Point2f> Chessboard::Board::getContour()const
last = 2; last = 2;
break; break;
} }
/* fallthrough */
case 3: // bottom case 3: // bottom
if(iter.bottom(true)) if(iter.bottom(true))
{ {
@ -2575,6 +2577,7 @@ std::vector<cv::Point2f> Chessboard::Board::getContour()const
last = 3; last = 3;
break; break;
} }
/* fallthrough */
case 4: // left case 4: // left
if(iter.left(true)) if(iter.left(true))
{ {

1
modules/calib3d/test/test_chesscorners.cpp
View File

@ -148,6 +148,7 @@ void CV_ChessboardDetectorTest::run( int /*start_from */)
{ {
case CHESSBOARD_SB: case CHESSBOARD_SB:
checkByGeneratorHighAccuracy(); // not supported by CHESSBOARD checkByGeneratorHighAccuracy(); // not supported by CHESSBOARD
/* fallthrough */
case CHESSBOARD: case CHESSBOARD:
checkByGenerator(); checkByGenerator();
if (ts->get_err_code() != cvtest::TS::OK) if (ts->get_err_code() != cvtest::TS::OK)