Merge pull request #3321 from y-guyon:fix_get_subbox_chart_physical

Remove unused size of get_subbox_chart_physical()
pull/3346/head
Alexander Smorkalov 3 years ago committed by GitHub
commit 467fd624e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      modules/mcc/src/checker_detector.cpp
  2. 3
      modules/mcc/src/checker_detector.hpp

@ -802,8 +802,7 @@ void CCheckerDetectorImpl::
// get physical char box model // get physical char box model
std::vector<cv::Point2f> chartPhy; std::vector<cv::Point2f> chartPhy;
cv::Size size_box_phy; get_subbox_chart_physical(points, chartPhy);
get_subbox_chart_physical(points, chartPhy, size_box_phy);
// Find the perspective transformation that brings current chart to rectangular form // Find the perspective transformation that brings current chart to rectangular form
Matx33f ccT = cv::getPerspectiveTransform(points, chartPhy); Matx33f ccT = cv::getPerspectiveTransform(points, chartPhy);
@ -1101,7 +1100,7 @@ void CCheckerDetectorImpl::
} }
void CCheckerDetectorImpl:: void CCheckerDetectorImpl::
get_subbox_chart_physical(const std::vector<cv::Point2f> &points, std::vector<cv::Point2f> &chartPhy, cv::Size &size) get_subbox_chart_physical(const std::vector<cv::Point2f> &points, std::vector<cv::Point2f> &chartPhy)
{ {
float w, h; float w, h;
cv::Point2f v1 = points[1] - points[0]; cv::Point2f v1 = points[1] - points[0];
@ -1117,8 +1116,6 @@ void CCheckerDetectorImpl::
chartPhy[1] = cv::Point2f(w, 0); chartPhy[1] = cv::Point2f(w, 0);
chartPhy[2] = cv::Point2f(w, h); chartPhy[2] = cv::Point2f(w, h);
chartPhy[3] = cv::Point2f(0, h); chartPhy[3] = cv::Point2f(0, h);
size = cv::Size((int)w, (int)h);
} }
void CCheckerDetectorImpl:: void CCheckerDetectorImpl::

@ -164,8 +164,7 @@ protected:
private: // methods aux private: // methods aux
void get_subbox_chart_physical( void get_subbox_chart_physical(
const std::vector<cv::Point2f> &points, const std::vector<cv::Point2f> &points,
std::vector<cv::Point2f> &chartPhy, std::vector<cv::Point2f> &chartPhy);
cv::Size &size);
void reduce_array( void reduce_array(
const std::vector<float> &x, const std::vector<float> &x,

Loading…
Cancel
Save