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

Merge pull request #229 from Nerei:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-12-17 20:28:57 +04:00 committed by OpenCV Buildbot
commit d3354c543e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/cpp/detector_descriptor_evaluation.cpp
View File

@ -535,7 +535,7 @@ void DetectorQualityEvaluator::readAlgorithm ()
{
defaultDetector = FeatureDetector::create( algName );
specificDetector = FeatureDetector::create( algName );
if( defaultDetector == 0 )
if( defaultDetector.empty() )
{
printf( "Algorithm can not be read\n" );
exit(-1);
@ -769,14 +769,14 @@ void DescriptorQualityEvaluator::readAlgorithm( )
defaultDescMatcher = GenericDescriptorMatcher::create( algName );
specificDescMatcher = GenericDescriptorMatcher::create( algName );
if( defaultDescMatcher == 0 )
if( defaultDescMatcher.empty() )
{
Ptr<DescriptorExtractor> extractor = DescriptorExtractor::create( algName );
Ptr<DescriptorMatcher> matcher = DescriptorMatcher::create( matcherName );
defaultDescMatcher = new VectorDescriptorMatch( extractor, matcher );
specificDescMatcher = new VectorDescriptorMatch( extractor, matcher );
if( extractor == 0 || matcher == 0 )
if( extractor.empty() || matcher.empty() )
{
printf("Algorithm can not be read\n");
exit(-1);

2
samples/cpp/generic_descriptor_match.cpp
View File

@ -32,7 +32,7 @@ int main(int argc, char** argv)
std::string params_filename = std::string(argv[4]);
Ptr<GenericDescriptorMatcher> descriptorMatcher = GenericDescriptorMatcher::create(alg_name, params_filename);
if( descriptorMatcher == 0 )
if( descriptorMatcher.empty() )
{
printf ("Cannot create descriptor\n");
return 0;