Merge pull request #21107 from take1014:remove_assert_21038

resolves #21038

* remove C assert

* revert C header

* fix several points in review

* fix test_ds.cpp

modules/features2d/test/test_descriptors_regression.cpp

@@ -159,7 +159,7 @@ protected:
 
     void emptyDataTest()
     {
-        assert( dextractor );
+        CV_Assert( dextractor );
 
         // One image.
         Mat image;
@@ -205,7 +205,7 @@ protected:
 
     void regressionTest()
     {
-        assert( dextractor );
+        CV_Assert( dextractor );
 
         // Read the test image.
         string imgFilename =  string(ts->get_data_path()) + FEATURES2D_DIR + "/" + IMAGE_FILENAME;

modules/features2d/test/test_detectors_regression.cpp

@@ -154,7 +154,7 @@ void CV_FeatureDetectorTest::compareKeypointSets( const vector<KeyPoint>& validK
             }
         }
 
-        assert( minDist >= 0 );
+        CV_Assert( minDist >= 0 );
         if( !isSimilarKeypoints( validKeypoints[v], calcKeypoints[nearestIdx] ) )
             badPointCount++;
     }
@@ -171,7 +171,7 @@ void CV_FeatureDetectorTest::compareKeypointSets( const vector<KeyPoint>& validK
 
 void CV_FeatureDetectorTest::regressionTest()
 {
-    assert( !fdetector.empty() );
+    CV_Assert( !fdetector.empty() );
     string imgFilename = string(ts->get_data_path()) + FEATURES2D_DIR + "/" + IMAGE_FILENAME;
     string resFilename = string(ts->get_data_path()) + DETECTOR_DIR + "/" + string(name) + ".xml.gz";
 

modules/features2d/test/test_nearestneighbors.cpp

@@ -312,7 +312,7 @@ void CV_FlannSavedIndexTest::createModel(const cv::Mat &data)
         case 1: createIndex( data, KDTreeIndexParams() ); break;
         //case 2: createIndex( data, CompositeIndexParams() ); break; // nothing to save for linear search
         //case 2: createIndex( data, AutotunedIndexParams() ); break; // possible linear index !
-        default: assert(0);
+        default: CV_Assert(0);
     }
     string filename = tempfile();
     index->save( filename );