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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/legacy/src/features2d.cpp
View File

@ -73,7 +73,7 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask,
Mat descr; Mat descr;
Ptr<Feature2D> surf = Algorithm::create<Feature2D>("Feature2D.SURF"); Ptr<Feature2D> surf = Algorithm::create<Feature2D>("Feature2D.SURF");
if( surf.empty() ) if( !surf )
CV_Error(CV_StsNotImplemented, "OpenCV was built without SURF support"); CV_Error(CV_StsNotImplemented, "OpenCV was built without SURF support");
surf->set("hessianThreshold", params.hessianThreshold); surf->set("hessianThreshold", params.hessianThreshold);
@ -107,10 +107,10 @@ CV_IMPL CvSeq*
cvGetStarKeypoints( const CvArr* _img, CvMemStorage* storage, cvGetStarKeypoints( const CvArr* _img, CvMemStorage* storage,
CvStarDetectorParams params ) CvStarDetectorParams params )
{ {
Ptr<StarDetector> star = new StarDetector(params.maxSize, params.responseThreshold, Ptr<StarDetector> star(new StarDetector(params.maxSize, params.responseThreshold,
params.lineThresholdProjected, params.lineThresholdProjected,
params.lineThresholdBinarized, params.lineThresholdBinarized,
params.suppressNonmaxSize); params.suppressNonmaxSize));
std::vector<KeyPoint> kpts; std::vector<KeyPoint> kpts;
star->detect(cvarrToMat(_img), kpts, Mat()); star->detect(cvarrToMat(_img), kpts, Mat());

2
modules/legacy/src/kdtree.cpp
View File

@ -172,7 +172,7 @@ public:
CV_Error(CV_StsUnsupportedFormat, "dist must be CV_64FC1"); CV_Error(CV_StsUnsupportedFormat, "dist must be CV_64FC1");
if (CV_MAT_TYPE(type()) != CV_MAT_TYPE(desc->type)) { if (CV_MAT_TYPE(type()) != CV_MAT_TYPE(desc->type)) {
tmp_desc = cvCreateMat(desc->rows, desc->cols, type()); tmp_desc.reset(cvCreateMat(desc->rows, desc->cols, type()));
cvConvert(desc, tmp_desc); cvConvert(desc, tmp_desc);
desc = tmp_desc; desc = tmp_desc;
} }

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

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

15
modules/legacy/src/planardetect.cpp
View File

@ -1240,7 +1240,7 @@ FernDescriptorMatcher::FernDescriptorMatcher( const Params& _params )
params = _params; params = _params;
if( !params.filename.empty() ) if( !params.filename.empty() )
{ {
classifier = new FernClassifier; classifier = makePtr<FernClassifier>();
FileStorage fs(params.filename, FileStorage::READ); FileStorage fs(params.filename, FileStorage::READ);
if( fs.isOpened() ) if( fs.isOpened() )
classifier->read( fs.getFirstTopLevelNode() ); classifier->read( fs.getFirstTopLevelNode() );
@ -1260,7 +1260,7 @@ void FernDescriptorMatcher::clear()
void FernDescriptorMatcher::train() void FernDescriptorMatcher::train()
{ {
if( classifier.empty() || prevTrainCount < (int)trainPointCollection.keypointCount() ) if( !classifier || prevTrainCount < (int)trainPointCollection.keypointCount() )
{ {
assert( params.filename.empty() ); assert( params.filename.empty() );
@ -1268,9 +1268,10 @@ void FernDescriptorMatcher::train()
for( size_t imgIdx = 0; imgIdx < trainPointCollection.imageCount(); imgIdx++ ) for( size_t imgIdx = 0; imgIdx < trainPointCollection.imageCount(); imgIdx++ )
KeyPoint::convert( trainPointCollection.getKeypoints((int)imgIdx), points[imgIdx] ); KeyPoint::convert( trainPointCollection.getKeypoints((int)imgIdx), points[imgIdx] );
classifier = new FernClassifier( points, trainPointCollection.getImages(), std::vector<std::vector<int> >(), 0, // each points is a class classifier.reset(
params.patchSize, params.signatureSize, params.nstructs, params.structSize, new FernClassifier( points, trainPointCollection.getImages(), std::vector<std::vector<int> >(), 0, // each points is a class
params.nviews, params.compressionMethod, params.patchGenerator ); params.patchSize, params.signatureSize, params.nstructs, params.structSize,
params.nviews, params.compressionMethod, params.patchGenerator ));
} }
} }
@ -1384,12 +1385,12 @@ void FernDescriptorMatcher::write( FileStorage& fs ) const
bool FernDescriptorMatcher::empty() const bool FernDescriptorMatcher::empty() const
{ {
return classifier.empty() || classifier->empty(); return !classifier || classifier->empty();
} }
Ptr<GenericDescriptorMatcher> FernDescriptorMatcher::clone( bool emptyTrainData ) const Ptr<GenericDescriptorMatcher> FernDescriptorMatcher::clone( bool emptyTrainData ) const
{ {
FernDescriptorMatcher* matcher = new FernDescriptorMatcher( params ); Ptr<FernDescriptorMatcher> matcher = makePtr<FernDescriptorMatcher>( params );
if( !emptyTrainData ) if( !emptyTrainData )
{ {
CV_Error( CV_StsNotImplemented, "deep clone dunctionality is not implemented, because " CV_Error( CV_StsNotImplemented, "deep clone dunctionality is not implemented, because "