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

Boring changes - legacy.

Browse Source
This commit is contained in:
Roman Donchenko
2013-08-13 18:29:36 +04:00
parent 34127ba80f
commit eaa7fcc3e6
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/legacy/src/oneway.cpp
View File

@@ -1736,7 +1736,7 @@ namespace cv{
{
std::vector<KeyPoint> features;
Ptr<FeatureDetector> surf_extractor = FeatureDetector::create("SURF");
if( surf_extractor.empty() )
if( !surf_extractor )
CV_Error(CV_StsNotImplemented, "OpenCV was built without SURF support");
surf_extractor->set("hessianThreshold", 1.0);
//printf("Extracting SURF features...");
@@ -2186,7 +2186,7 @@ namespace cv{
{
clear();
if( _base.empty() )
if( !_base )
base = _base;
params = _params;
@@ -2197,16 +2197,17 @@ namespace cv{
GenericDescriptorMatcher::clear();
prevTrainCount = 0;
if( !base.empty() )
if( base )
base->clear();
}
void OneWayDescriptorMatcher::train()
{
if( base.empty() || prevTrainCount < (int)trainPointCollection.keypointCount() )
if( !base || prevTrainCount < (int)trainPointCollection.keypointCount() )
{
base = new OneWayDescriptorObject( params.patchSize, params.poseCount, params.pcaFilename,
params.trainPath, params.trainImagesList, params.minScale, params.maxScale, params.stepScale );
base.reset(
new OneWayDescriptorObject( params.patchSize, params.poseCount, params.pcaFilename,
params.trainPath, params.trainImagesList, params.minScale, params.maxScale, params.stepScale ));
base->Allocate( (int)trainPointCollection.keypointCount() );
prevTrainCount = (int)trainPointCollection.keypointCount();
@@ -2270,8 +2271,9 @@ namespace cv{
void OneWayDescriptorMatcher::read( const FileNode &fn )
{
base = new OneWayDescriptorObject( params.patchSize, params.poseCount, String (), String (), String (),
params.minScale, params.maxScale, params.stepScale );
base.reset(
new OneWayDescriptorObject( params.patchSize, params.poseCount, String (), String (), String (),
params.minScale, params.maxScale, params.stepScale ));
base->Read (fn);
}
@@ -2282,12 +2284,12 @@ namespace cv{
bool OneWayDescriptorMatcher::empty() const
{
return base.empty() || base->empty();
return !base || base->empty();
}
Ptr<GenericDescriptorMatcher> OneWayDescriptorMatcher::clone( bool emptyTrainData ) const
{
OneWayDescriptorMatcher* matcher = new OneWayDescriptorMatcher( params );
Ptr<OneWayDescriptorMatcher> matcher = makePtr<OneWayDescriptorMatcher>( params );
if( !emptyTrainData )
{