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

some renames

Browse Source
This commit is contained in:
Maria Dimashova 2011-05-15 09:19:05 +00:00
parent 05394d9835
commit 8acce4e31f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@ -1473,7 +1473,8 @@ protected:
class CV_EXPORTS PyramidAdaptedFeatureDetector : public FeatureDetector class CV_EXPORTS PyramidAdaptedFeatureDetector : public FeatureDetector
{ {
public: public:
PyramidAdaptedFeatureDetector( const Ptr<FeatureDetector>& detector, int levels=2 ); // maxLevel - The 0-based index of the last pyramid layer
PyramidAdaptedFeatureDetector( const Ptr<FeatureDetector>& detector, int maxLevel=2 );
// TODO implement read/write // TODO implement read/write
virtual bool empty() const; virtual bool empty() const;
@ -1482,7 +1483,7 @@ protected:
virtual void detectImpl( const Mat& image, vector<KeyPoint>& keypoints, const Mat& mask=Mat() ) const; virtual void detectImpl( const Mat& image, vector<KeyPoint>& keypoints, const Mat& mask=Mat() ) const;
Ptr<FeatureDetector> detector; Ptr<FeatureDetector> detector;
int levels; int maxLevel;
}; };
/** \brief A feature detector parameter adjuster, this is used by the DynamicAdaptedFeatureDetector /** \brief A feature detector parameter adjuster, this is used by the DynamicAdaptedFeatureDetector

8
modules/features2d/src/detectors.cpp
View File

@ -536,8 +536,8 @@ void GridAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>&
/* /*
* PyramidAdaptedFeatureDetector * PyramidAdaptedFeatureDetector
*/ */
PyramidAdaptedFeatureDetector::PyramidAdaptedFeatureDetector( const Ptr<FeatureDetector>& _detector, int _levels ) PyramidAdaptedFeatureDetector::PyramidAdaptedFeatureDetector( const Ptr<FeatureDetector>& _detector, int _maxLevel )
: detector(_detector), levels(_levels) : detector(_detector), maxLevel(_maxLevel)
{} {}
bool PyramidAdaptedFeatureDetector::empty() const bool PyramidAdaptedFeatureDetector::empty() const
@ -548,7 +548,7 @@ bool PyramidAdaptedFeatureDetector::empty() const
void PyramidAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>& keypoints, const Mat& mask ) const void PyramidAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>& keypoints, const Mat& mask ) const
{ {
Mat src = image; Mat src = image;
for( int l = 0, multiplier = 1; l <= levels; ++l, multiplier *= 2 ) for( int l = 0, multiplier = 1; l <= maxLevel; ++l, multiplier *= 2 )
{ {
// Detect on current level of the pyramid // Detect on current level of the pyramid
vector<KeyPoint> new_pts; vector<KeyPoint> new_pts;
@ -563,7 +563,7 @@ void PyramidAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoin
keypoints.insert( keypoints.end(), new_pts.begin(), new_pts.end() ); keypoints.insert( keypoints.end(), new_pts.begin(), new_pts.end() );
// Downsample // Downsample
if( l < levels ) if( l < maxLevel )
{ {
Mat dst; Mat dst;
pyrDown(src, dst); pyrDown(src, dst);