Boring changes - nonfree.

modules/nonfree/test/test_features2d.cpp

@@ -231,7 +231,7 @@ void CV_FeatureDetectorTest::regressionTest()
 
 void CV_FeatureDetectorTest::run( int /*start_from*/ )
 {
-    if( fdetector.empty() )
+    if( !fdetector )
     {
         ts->printf( cvtest::TS::LOG, "Feature detector is empty.\n" );
         ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
@@ -464,7 +464,7 @@ protected:
     void run(int)
     {
         createDescriptorExtractor();
-        if( dextractor.empty() )
+        if( !dextractor )
         {
             ts->printf(cvtest::TS::LOG, "Descriptor extractor is empty.\n");
             ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
@@ -1101,7 +1101,7 @@ protected:
     void run(int)
     {
         Ptr<Feature2D> f = Algorithm::create<Feature2D>("Feature2D." + fname);
-        if(f.empty())
+        if(!f)
             return;
         string path = string(ts->get_data_path()) + "detectors_descriptors_evaluation/planar/";
         string imgname1 = path + "box.png";
@@ -1156,7 +1156,7 @@ public:
     FeatureDetectorUsingMaskTest(const Ptr<FeatureDetector>& featureDetector) :
         featureDetector_(featureDetector)
     {
-        CV_Assert(!featureDetector_.empty());
+        CV_Assert(featureDetector_);
     }
 
 protected:

modules/nonfree/test/test_keypoints.cpp

@@ -62,7 +62,7 @@ protected:
     virtual void run(int)
     {
         cv::initModule_features2d();
-        CV_Assert(!detector.empty());
+        CV_Assert(detector);
         string imgFilename = string(ts->get_data_path()) + FEATURES2D_DIR + "/" + IMAGE_FILENAME;
 
         // Read the test image.

modules/nonfree/test/test_rotation_and_scale_invariance.cpp

@@ -210,7 +210,7 @@ public:
         minKeyPointMatchesRatio(_minKeyPointMatchesRatio),
         minAngleInliersRatio(_minAngleInliersRatio)
     {
-        CV_Assert(!featureDetector.empty());
+        CV_Assert(featureDetector);
     }
 
 protected:
@@ -323,8 +323,8 @@ public:
         normType(_normType),
         minDescInliersRatio(_minDescInliersRatio)
     {
-        CV_Assert(!featureDetector.empty());
-        CV_Assert(!descriptorExtractor.empty());
+        CV_Assert(featureDetector);
+        CV_Assert(descriptorExtractor);
     }
 
 protected:
@@ -410,7 +410,7 @@ public:
         minKeyPointMatchesRatio(_minKeyPointMatchesRatio),
         minScaleInliersRatio(_minScaleInliersRatio)
     {
-        CV_Assert(!featureDetector.empty());
+        CV_Assert(featureDetector);
     }
 
 protected:
@@ -530,8 +530,8 @@ public:
         normType(_normType),
         minDescInliersRatio(_minDescInliersRatio)
     {
-        CV_Assert(!featureDetector.empty());
-        CV_Assert(!descriptorExtractor.empty());
+        CV_Assert(featureDetector);
+        CV_Assert(descriptorExtractor);
     }
 
 protected: