some renames

diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp
index 201d658..a6ddd91 100644 (file)
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -1473,7 +1473,8 @@ protected:
 class CV_EXPORTS PyramidAdaptedFeatureDetector : public FeatureDetector
 {
 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
     virtual bool empty() const;
@@ -1482,7 +1483,7 @@ protected:
     virtual void detectImpl( const Mat& image, vector<KeyPoint>& keypoints, const Mat& mask=Mat() ) const;
 
     Ptr<FeatureDetector> detector;
-    int levels;
+    int maxLevel;
 };
 
 /** \brief A feature detector parameter adjuster, this is used by the DynamicAdaptedFeatureDetector

diff --git a/modules/features2d/src/detectors.cpp b/modules/features2d/src/detectors.cpp
index c6efe00..cd745a6 100644 (file)
--- a/modules/features2d/src/detectors.cpp
+++ b/modules/features2d/src/detectors.cpp
@@ -536,8 +536,8 @@ void GridAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>&
 /*
  *  PyramidAdaptedFeatureDetector
  */
-PyramidAdaptedFeatureDetector::PyramidAdaptedFeatureDetector( const Ptr<FeatureDetector>& _detector, int _levels )
-    : detector(_detector), levels(_levels)
+PyramidAdaptedFeatureDetector::PyramidAdaptedFeatureDetector( const Ptr<FeatureDetector>& _detector, int _maxLevel )
+    : detector(_detector), maxLevel(_maxLevel)
 {}
 
 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
 {
     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
         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() );
 
         // Downsample
-        if( l < levels )
+        if( l < maxLevel )
         {
             Mat dst;
             pyrDown(src, dst);