Skip to content

O
opencv_contrib
Commit 49a7cb62 authored by GilLevi's avatar GilLevi
Browse files
Options

fixed warnings4

parent cd8a7339
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/xfeatures2d/src/latch.cpp
View file @ 49a7cb62
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
virtual void compute(InputArray image, std::vector<KeyPoint>& keypoints, OutputArray descriptors); virtual void compute(InputArray image, std::vector<KeyPoint>& keypoints, OutputArray descriptors);
protected: protected:
typedef void(*PixelTestFn)(const Mat& input_image, const std::vector<KeyPoint>& keypoints, OutputArray&, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size); typedef void(*PixelTestFn)(const Mat& input_image, const std::vector<KeyPoint>& keypoints, OutputArray, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size);
int bytes_; int bytes_;
PixelTestFn test_fn_; PixelTestFn test_fn_;
...@@ -93,7 +93,7 @@ protected: ...@@ -93,7 +93,7 @@ protected:
void CacluateSums(int count, const std::vector<int> &points, bool rotationInvariance, const Mat &grayImage, const KeyPoint &pt, int &suma, int &sumc, float cos_theta, float sin_theta, int half_ssd_size); void CacluateSums(int count, const std::vector<int> &points, bool rotationInvariance, const Mat &grayImage, const KeyPoint &pt, int &suma, int &sumc, float cos_theta, float sin_theta, int half_ssd_size);
static void pixelTests1(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray& _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size) static void pixelTests1(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size)
{ {
Mat descriptors = _descriptors.getMat(); Mat descriptors = _descriptors.getMat();
for (int i = 0; i < (int)keypoints.size(); ++i) for (int i = 0; i < (int)keypoints.size(); ++i)
...@@ -124,7 +124,7 @@ static void pixelTests1(const Mat& grayImage, const std::vector<KeyPoint>& keypo ...@@ -124,7 +124,7 @@ static void pixelTests1(const Mat& grayImage, const std::vector<KeyPoint>& keypo
} }
static void pixelTests2(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray& _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size) static void pixelTests2(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size)
{ {
Mat descriptors = _descriptors.getMat(); Mat descriptors = _descriptors.getMat();
for (int i = 0; i < (int)keypoints.size(); ++i) for (int i = 0; i < (int)keypoints.size(); ++i)
...@@ -155,7 +155,7 @@ static void pixelTests2(const Mat& grayImage, const std::vector<KeyPoint>& keypo ...@@ -155,7 +155,7 @@ static void pixelTests2(const Mat& grayImage, const std::vector<KeyPoint>& keypo
} }
static void pixelTests4(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray& _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size) static void pixelTests4(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size)
{ {
Mat descriptors = _descriptors.getMat(); Mat descriptors = _descriptors.getMat();
for (int i = 0; i < (int)keypoints.size(); ++i) for (int i = 0; i < (int)keypoints.size(); ++i)
...@@ -187,7 +187,7 @@ static void pixelTests4(const Mat& grayImage, const std::vector<KeyPoint>& keypo ...@@ -187,7 +187,7 @@ static void pixelTests4(const Mat& grayImage, const std::vector<KeyPoint>& keypo
static void pixelTests8(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray& _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size) static void pixelTests8(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size)
{ {
Mat descriptors = _descriptors.getMat(); Mat descriptors = _descriptors.getMat();
for (int i = 0; i < (int)keypoints.size(); ++i) for (int i = 0; i < (int)keypoints.size(); ++i)
...@@ -218,7 +218,7 @@ static void pixelTests8(const Mat& grayImage, const std::vector<KeyPoint>& keypo ...@@ -218,7 +218,7 @@ static void pixelTests8(const Mat& grayImage, const std::vector<KeyPoint>& keypo
} }
static void pixelTests16(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray& _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size) static void pixelTests16(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size)
{ {
Mat descriptors = _descriptors.getMat(); Mat descriptors = _descriptors.getMat();
for (int i = 0; i < (int)keypoints.size(); ++i) for (int i = 0; i < (int)keypoints.size(); ++i)
...@@ -249,7 +249,7 @@ static void pixelTests16(const Mat& grayImage, const std::vector<KeyPoint>& keyp ...@@ -249,7 +249,7 @@ static void pixelTests16(const Mat& grayImage, const std::vector<KeyPoint>& keyp
} }
static void pixelTests32(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray& _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size) static void pixelTests32(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size)
{ {
Mat descriptors = _descriptors.getMat(); Mat descriptors = _descriptors.getMat();
for (int i = 0; i < (int)keypoints.size(); ++i) for (int i = 0; i < (int)keypoints.size(); ++i)
...@@ -279,7 +279,7 @@ static void pixelTests32(const Mat& grayImage, const std::vector<KeyPoint>& keyp ...@@ -279,7 +279,7 @@ static void pixelTests32(const Mat& grayImage, const std::vector<KeyPoint>& keyp
} }
static void pixelTests64(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray& _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size) static void pixelTests64(const Mat& grayImage, const std::vector<KeyPoint>& keypoints, OutputArray _descriptors, const std::vector<int> &points, bool rotationInvariance, int half_ssd_size)
{ {
Mat descriptors = _descriptors.getMat(); Mat descriptors = _descriptors.getMat();
for (int i = 0; i < (int)keypoints.size(); ++i) for (int i = 0; i < (int)keypoints.size(); ++i)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment