提交 e3ce0fbe 编写于 作者: A Alexander Alekhin

Merge pull request #18685 from APrigarina:fix_curved_qrcodes

...@@ -993,7 +993,7 @@ protected: ...@@ -993,7 +993,7 @@ protected:
bool computeClosestPoints(const vector<Point> &result_integer_hull); bool computeClosestPoints(const vector<Point> &result_integer_hull);
bool computeSidesPoints(const vector<Point> &result_integer_hull); bool computeSidesPoints(const vector<Point> &result_integer_hull);
vector<Point> getPointsNearUnstablePoint(const vector<Point> &side, int start, int end, int step); vector<Point> getPointsNearUnstablePoint(const vector<Point> &side, int start, int end, int step);
bool findAndAddStablePoint(const vector<Point> &result_integer_hull); bool findAndAddStablePoint();
bool findIndexesCurvedSides(); bool findIndexesCurvedSides();
bool findIncompleteIndexesCurvedSides(); bool findIncompleteIndexesCurvedSides();
Mat getPatternsMask(); Mat getPatternsMask();
...@@ -1274,7 +1274,7 @@ vector<Point> QRDecode::getPointsNearUnstablePoint(const vector<Point> &side, in ...@@ -1274,7 +1274,7 @@ vector<Point> QRDecode::getPointsNearUnstablePoint(const vector<Point> &side, in
return points; return points;
} }
bool QRDecode::findAndAddStablePoint(const vector<Point> &result_integer_hull) bool QRDecode::findAndAddStablePoint()
{ {
size_t idx_unstable_point = unstable_pair.first; size_t idx_unstable_point = unstable_pair.first;
Point unstable_point = unstable_pair.second; Point unstable_point = unstable_pair.second;
...@@ -1385,7 +1385,7 @@ bool QRDecode::findAndAddStablePoint(const vector<Point> &result_integer_hull) ...@@ -1385,7 +1385,7 @@ bool QRDecode::findAndAddStablePoint(const vector<Point> &result_integer_hull)
bool add_stable_point = true; bool add_stable_point = true;
for (size_t i = 0; i < result_integer_hull.size(); i++) for (size_t i = 0; i < original_points.size(); i++)
{ {
if(arePointsNearest(stable_point, original_points[i], 3.0)) if(arePointsNearest(stable_point, original_points[i], 3.0))
{ {
...@@ -2211,7 +2211,7 @@ bool QRDecode::preparingCurvedQRCodes() ...@@ -2211,7 +2211,7 @@ bool QRDecode::preparingCurvedQRCodes()
return false; return false;
if (!computeSidesPoints(result_integer_hull)) if (!computeSidesPoints(result_integer_hull))
return false; return false;
if (!findAndAddStablePoint(result_integer_hull)) if (!findAndAddStablePoint())
return false; return false;
if (!findIndexesCurvedSides()) if (!findIndexesCurvedSides())
return false; return false;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册