1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2025-09-26 09:24:38 +03:00
91 changed files with 5339 additions and 1508 deletions
+6 -4
View File
@@ -3417,8 +3417,10 @@ int QRDetectMulti::findNumberLocalizationPoints(vector<Point2f>& tmp_localizatio
Mat tmp_shrinking = bin_barcode;
int tmp_num_points = 0;
int num_points = -1;
for (eps_horizontal = 0.1; eps_horizontal < 0.4; eps_horizontal += 0.1)
double eps = 0.0;
for (int epsCoeff = 1; epsCoeff <= 3; epsCoeff++)
{
eps = eps_horizontal * static_cast<double>(epsCoeff);
tmp_num_points = 0;
num_points = -1;
if (purpose == SHRINKING)
@@ -3443,7 +3445,7 @@ int QRDetectMulti::findNumberLocalizationPoints(vector<Point2f>& tmp_localizatio
else
break;
}
vector<Point2f> list_lines_y = extractVerticalLines(list_lines_x, eps_horizontal);
vector<Point2f> list_lines_y = extractVerticalLines(list_lines_x, eps);
if (list_lines_y.size() < 3)
{
if (k == 0)
@@ -3453,7 +3455,7 @@ int QRDetectMulti::findNumberLocalizationPoints(vector<Point2f>& tmp_localizatio
list_lines_x = searchHorizontalLines();
if (list_lines_x.empty())
break;
list_lines_y = extractVerticalLines(list_lines_x, eps_horizontal);
list_lines_y = extractVerticalLines(list_lines_x, eps);
if (list_lines_y.size() < 3)
break;
}
@@ -3531,7 +3533,7 @@ int QRDetectMulti::findNumberLocalizationPoints(vector<Point2f>& tmp_localizatio
vector<Vec3d> list_lines_x = searchHorizontalLines();
if (list_lines_x.empty())
return num_points;
vector<Point2f> list_lines_y = extractVerticalLines(list_lines_x, eps_horizontal);
vector<Point2f> list_lines_y = extractVerticalLines(list_lines_x, eps);
if (list_lines_y.size() < 3)
return num_points;
if (num_points < 3)