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

replaced "unsigned int" -> "unsigned" to make Python/Java wrapper generator work correctly

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-09-14 14:29:30 +00:00
parent cdbee71f1c
commit 82da7f18d8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,8 +425,8 @@ public:
enum { DEFAULT_N_LEVELS = 3, DEFAULT_FIRST_LEVEL = 0}; enum { DEFAULT_N_LEVELS = 3, DEFAULT_FIRST_LEVEL = 0};
/** default constructor */ /** default constructor */
CommonParams(float scale_factor = 1.2f, unsigned int n_levels = DEFAULT_N_LEVELS, int edge_threshold = 31, CommonParams(float scale_factor = 1.2f, unsigned n_levels = DEFAULT_N_LEVELS, int edge_threshold = 31,
unsigned int first_level = DEFAULT_FIRST_LEVEL) : unsigned first_level = DEFAULT_FIRST_LEVEL) :
scale_factor_(scale_factor), n_levels_(n_levels), first_level_(first_level >= n_levels ? 0 : first_level), scale_factor_(scale_factor), n_levels_(n_levels), first_level_(first_level >= n_levels ? 0 : first_level),
edge_threshold_(edge_threshold) edge_threshold_(edge_threshold)
{ {
@ -439,11 +439,11 @@ public:
/** Coefficient by which we divide the dimensions from one scale pyramid level to the next */ /** Coefficient by which we divide the dimensions from one scale pyramid level to the next */
float scale_factor_; float scale_factor_;
/** The number of levels in the scale pyramid */ /** The number of levels in the scale pyramid */
unsigned int n_levels_; unsigned n_levels_;
/** The level at which the image is given /** The level at which the image is given
* if 1, that means we will also look at the image scale_factor_ times bigger * if 1, that means we will also look at the image scale_factor_ times bigger
*/ */
unsigned int first_level_; unsigned first_level_;
/** How far from the boundary the points should be */ /** How far from the boundary the points should be */
int edge_threshold_; int edge_threshold_;
@ -515,7 +515,7 @@ private:
* @param keypoints the resulting keypoints * @param keypoints the resulting keypoints
*/ */
void void
computeOrientation(const cv::Mat& image, const cv::Mat& integral_image, unsigned int level, computeOrientation(const cv::Mat& image, const cv::Mat& integral_image, unsigned level,
std::vector<cv::KeyPoint>& keypoints) const; std::vector<cv::KeyPoint>& keypoints) const;
/** Compute the ORB descriptors /** Compute the ORB descriptors
@ -526,7 +526,7 @@ private:
* @param descriptors the resulting descriptors * @param descriptors the resulting descriptors
*/ */
void void
computeDescriptors(const cv::Mat& image, const cv::Mat& integral_image, unsigned int level, computeDescriptors(const cv::Mat& image, const cv::Mat& integral_image, unsigned level,
std::vector<cv::KeyPoint>& keypoints, cv::Mat & descriptors) const; std::vector<cv::KeyPoint>& keypoints, cv::Mat & descriptors) const;
/** Compute the integral image and upadte the cached values /** Compute the integral image and upadte the cached values
@ -534,7 +534,7 @@ private:
* @param level the scale at which we compute the orientation * @param level the scale at which we compute the orientation
* @param descriptors the resulting descriptors * @param descriptors the resulting descriptors
*/ */
void computeIntegralImage(const cv::Mat & image, unsigned int level, cv::Mat &integral_image); void computeIntegralImage(const cv::Mat & image, unsigned level, cv::Mat &integral_image);
/** Parameters tuning ORB */ /** Parameters tuning ORB */
CommonParams params_; CommonParams params_;
@ -1554,7 +1554,7 @@ private:
/** The parameters used */ /** The parameters used */
ORB::CommonParams params_; ORB::CommonParams params_;
/** the number of features that need to be retrieved */ /** the number of features that need to be retrieved */
unsigned int n_features_; unsigned n_features_;
}; };
class CV_EXPORTS SimpleBlobDetector : public cv::FeatureDetector class CV_EXPORTS SimpleBlobDetector : public cv::FeatureDetector