Remove GSURF descriptor from KAZE algorithm

modules/features2d/doc/feature_detection_and_description.rst

@@ -256,29 +256,12 @@ KAZE
 
 Class implementing the KAZE keypoint detector and descriptor extractor, described in [ABD12]_. ::
 
-    class CV_EXPORTS_W KAZE : public Feature2D
-    {
-    public:
-
-        /// KAZE Descriptor Type
-        enum DESCRIPTOR_TYPE {
-            DESCRIPTOR_MSURF = 1,
-            DESCRIPTOR_GSURF = 2
-        };
-
-        CV_WRAP KAZE();
-        explicit KAZE(DESCRIPTOR_TYPE descriptor_type, bool extended, bool upright);
-
-        ....
-    };
-
 KAZE::KAZE
 ----------
 The KAZE constructor
 
-.. ocv:function:: KAZE::KAZE(DESCRIPTOR_TYPE descriptor_type, bool extended, bool upright)
+.. ocv:function:: KAZE::KAZE(bool extended, bool upright)
 
-    :param descriptor_type: Type of the extracted descriptor.
     :param extended: Set to enable extraction of extended (128-byte) descriptor.
     :param upright: Set to enable use of upright descriptors (non rotation-invariant).
 

modules/features2d/include/opencv2/features2d.hpp

@@ -893,14 +893,8 @@ KAZE implementation
 class CV_EXPORTS_W KAZE : public Feature2D
 {
 public:
-   /// AKAZE Descriptor Type
-    enum DESCRIPTOR_TYPE {
-        DESCRIPTOR_MSURF = 1,
-        DESCRIPTOR_GSURF = 2
-    };
-
     CV_WRAP KAZE();
-    explicit KAZE(DESCRIPTOR_TYPE descriptor_type, bool extended, bool upright);
+    CV_WRAP explicit KAZE(bool extended, bool upright);
 
     virtual ~KAZE();
 

modules/features2d/src/features2d_init.cpp

@@ -126,7 +126,6 @@ CV_INIT_ALGORITHM(GFTTDetector, "Feature2D.GFTT",
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 CV_INIT_ALGORITHM(KAZE, "Feature2D.KAZE",
-                  obj.info()->addParam(obj, "descriptor", obj.descriptor);
                   obj.info()->addParam(obj, "upright", obj.upright);
                   obj.info()->addParam(obj, "extended", obj.extended))
 

modules/features2d/src/kaze.cpp

@@ -53,15 +53,13 @@ http://www.robesafe.com/personal/pablo.alcantarilla/papers/Alcantarilla12eccv.pd
 namespace cv
 {
     KAZE::KAZE()
-        : descriptor(DESCRIPTOR_MSURF)
-        , extended(false)
+        : extended(false)
         , upright(false)
     {
     }
 
-    KAZE::KAZE(DESCRIPTOR_TYPE _descriptor_type, bool _extended, bool _upright)
-        : descriptor(_descriptor_type)
-        , extended(_extended)
+    KAZE::KAZE(bool _extended, bool _upright)
+        : extended(_extended)
         , upright(_upright)
     {
 
@@ -111,7 +109,6 @@ namespace cv
         KAZEOptions options;
         options.img_width = img.cols;
         options.img_height = img.rows;
-        options.descriptor = static_cast<DESCRIPTOR_TYPE>(descriptor);
         options.extended = extended;
         options.upright = upright;
 
@@ -146,7 +143,6 @@ namespace cv
         KAZEOptions options;
         options.img_width = img.cols;
         options.img_height = img.rows;
-        options.descriptor = static_cast<DESCRIPTOR_TYPE>(descriptor);
         options.extended = extended;
         options.upright = upright;
 
@@ -174,7 +170,6 @@ namespace cv
         KAZEOptions options;
         options.img_width = img.cols;
         options.img_height = img.rows;
-        options.descriptor = static_cast<DESCRIPTOR_TYPE>(descriptor);
         options.extended = extended;
         options.upright = upright;
 

modules/features2d/src/kaze/KAZEConfig.h

@@ -22,8 +22,7 @@ struct KAZEOptions {
     };
 
     KAZEOptions()
-        : descriptor(cv::KAZE::DESCRIPTOR_MSURF)
-        , diffusivity(PM_G2)
+        : diffusivity(PM_G2)
 
         , soffset(1.60f)
         , omax(4)
@@ -46,7 +45,6 @@ struct KAZEOptions {
     {
     }
 
-    cv::KAZE::DESCRIPTOR_TYPE descriptor;
     DIFFUSIVITY_TYPE diffusivity;
 
     float soffset;

modules/features2d/test/test_keypoints.cpp

@@ -169,11 +169,8 @@ TEST(Features2d_Detector_Keypoints_Dense, validation)
 
 TEST(Features2d_Detector_Keypoints_KAZE, validation)
 {
-    CV_FeatureDetectorKeypointsTest test_gsurf(cv::Ptr<FeatureDetector>(new cv::KAZE(cv::KAZE::DESCRIPTOR_GSURF, false, false)));
-    test_gsurf.safe_run();
-
-    CV_FeatureDetectorKeypointsTest test_msurf(cv::Ptr<FeatureDetector>(new cv::KAZE(cv::KAZE::DESCRIPTOR_MSURF, false, false)));
-    test_msurf.safe_run();
+    CV_FeatureDetectorKeypointsTest test(Algorithm::create<FeatureDetector>("Feature2D.KAZE"));
+    test.safe_run();
 }
 
 TEST(Features2d_Detector_Keypoints_AKAZE, validation)