Commit 93361768 authored by Daniel Angelov's avatar Daniel Angelov

Cleared shadowing warning.

parent d9813617
......@@ -135,7 +135,7 @@ private:
bool findPatternPass(const Mat& image, std::vector<Point2f>& matched_features, std::vector<Point3f>& pattern_points,
Mat& H, std::vector<Point2f>& scene_corners, const double pratio, const double proj_error,
const bool refine_position = false, const Mat& mask = Mat(), OutputArray output = noArray());
void scaleFoundPoints(const double squareSize, const std::vector<KeyPoint>& corners, std::vector<Point3f>& points3d);
void scaleFoundPoints(const double squareSize, const std::vector<KeyPoint>& corners, std::vector<Point3f>& pts3d);
void check_matches(std::vector<Point2f>& matched, const std::vector<Point2f>& pattern, std::vector<DMatch>& good, std::vector<Point3f>& pattern_3d, const Mat& H);
void keypoints2points(const std::vector<KeyPoint>& in, std::vector<Point2f>& out);
......
......@@ -49,6 +49,7 @@
#include <opencv2/core.hpp>
#include <opencv2/core/types_c.h> // CV_TERM
#include <opencv2/core/core_c.h> // CV_RGB
#include <opencv2/imgproc.hpp>
#include <opencv2/calib3d.hpp>
#include <opencv2/features2d.hpp>
......@@ -185,11 +186,11 @@ Ptr<DescriptorMatcher> CustomPattern::getDescriptorMatcher()
}
void CustomPattern::scaleFoundPoints(const double pixelSize,
const vector<KeyPoint>& corners, vector<Point3f>& points3d)
const vector<KeyPoint>& corners, vector<Point3f>& pts3d)
{
for (unsigned int i = 0; i < corners.size(); ++i)
{
points3d.push_back(Point3f(
pts3d.push_back(Point3f(
corners[i].pt.x * pixelSize,
corners[i].pt.y * pixelSize,
0));
......
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