Merge pull request #16625 from D-Alex:findChessboard
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 9 Mar 2020 22:21:29 +0000 (22:21 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 9 Mar 2020 22:21:29 +0000 (22:21 +0000)
1  2 
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/src/chessboard.cpp
modules/calib3d/src/chessboard.hpp

@@@ -3004,10 -3647,10 +3647,10 @@@ Chessboard::Board Chessboard::detectImp
      std::vector<KeyPoint> keypoints_seed;
      std::vector<std::vector<float> > angles;
      findKeyPoints(gray,keypoints_seed,feature_maps,angles,mask);
-     if(keypoints_seed.empty())
+     if(int(keypoints_seed.size()) < parameters.chessboard_size.width * parameters.chessboard_size.height)
          return Chessboard::Board();
  
 -    // check how many points are likely a checkerbord corner
 +    // check how many points are likely a checkerboard corner
      float response = fabs(keypoints_seed.front().response*MIN_RESPONSE_RATIO);
      std::vector<KeyPoint>::const_iterator seed_iter = keypoints_seed.begin();
      int count = 0;
Simple merge