generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Boring changes - nonfree.

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-13 17:36:38 +04:00
parent 345bc633cc
commit de6a934f66
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/nonfree/test/test_features2d.cpp
View File

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

2
modules/nonfree/test/test_keypoints.cpp
View File

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

12
modules/nonfree/test/test_rotation_and_scale_invariance.cpp
View File

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