Added a full Python wrapper of findCirclesGrid

diff --git a/modules/calib3d/include/opencv2/calib3d/calib3d.hpp b/modules/calib3d/include/opencv2/calib3d/calib3d.hpp
index edf31a0..e344035 100644 (file)
--- a/modules/calib3d/include/opencv2/calib3d/calib3d.hpp
+++ b/modules/calib3d/include/opencv2/calib3d/calib3d.hpp
@@ -544,13 +544,10 @@ enum { CALIB_CB_SYMMETRIC_GRID = 1, CALIB_CB_ASYMMETRIC_GRID = 2,
        CALIB_CB_CLUSTERING = 4 };
 
 //! finds circles' grid pattern of the specified size in the image
-CV_EXPORTS bool findCirclesGrid( InputArray image, Size patternSize,
+CV_EXPORTS_W bool findCirclesGrid( InputArray image, Size patternSize,
                                  OutputArray centers, int flags=CALIB_CB_SYMMETRIC_GRID,
                                  const Ptr<FeatureDetector> &blobDetector = new SimpleBlobDetector());
 
-CV_EXPORTS_W bool findCirclesGridDefault( InputArray image, Size patternSize,
-                                          OutputArray centers, int flags=CALIB_CB_SYMMETRIC_GRID );
-
 enum
 {
     CALIB_USE_INTRINSIC_GUESS = CV_CALIB_USE_INTRINSIC_GUESS,

diff --git a/modules/calib3d/src/circlesgrid.cpp b/modules/calib3d/src/circlesgrid.cpp
index 26c0e61..bb2dae6 100644 (file)
--- a/modules/calib3d/src/circlesgrid.cpp
+++ b/modules/calib3d/src/circlesgrid.cpp
@@ -1589,9 +1589,3 @@ size_t CirclesGridFinder::getFirstCorner(vector<Point> &largeCornerIndices, vect
   return cornerIdx;
 }
 
-bool cv::findCirclesGridDefault( InputArray image, Size patternSize,
-                             OutputArray centers, int flags )
-{
-    return findCirclesGrid(image, patternSize, centers, flags);
-}
-