potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-02-16 18:45:22 +03:00
parent d4fd5157fa 12aa0fe898
commit f084a229b4
26 changed files with 441 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/src/barcode.cpp
+2 -2
View File
@@ -302,13 +302,13 @@ string BarcodeImpl::detectAndDecode(InputArray img, OutputArray points, OutputAr
CV_UNUSED(straight_code);
vector<string> decoded_info;
vector<string> decoded_type;
vector<Point> points_;
vector<Point2f> points_;
if (!detectAndDecodeWithType(img, decoded_info, decoded_type, points_))
return string();
if (points_.size() < 4 || decoded_info.size() < 1)
return string();
points_.resize(4);
points.setTo(points_);
updatePointsResult(points, points_);
return decoded_info[0];
}
modules/objdetect/src/qrcode.cpp
+24 -12
View File
@@ -467,16 +467,25 @@ bool QRDetect::localization()
CV_TRACE_FUNCTION();
Point2f begin, end;
vector<Vec3d> list_lines_x = searchHorizontalLines();
if( list_lines_x.empty() ) { return false; }
vector<Point2f> list_lines_y = separateVerticalLines(list_lines_x);
if( list_lines_y.empty() ) { return false; }
vector<Point2f> list_lines_y;
Mat labels;
kmeans(list_lines_y, 3, labels,
TermCriteria( TermCriteria::EPS + TermCriteria::COUNT, 10, 0.1),
3, KMEANS_PP_CENTERS, localization_points);
if (!list_lines_x.empty())
{
list_lines_y = separateVerticalLines(list_lines_x);
if (!list_lines_y.empty())
{
kmeans(list_lines_y, 3, labels,
TermCriteria( TermCriteria::EPS + TermCriteria::COUNT, 10, 0.1),
3, KMEANS_PP_CENTERS, localization_points);
fixationPoints(localization_points);
fixationPoints(localization_points);
}
}
if (labels.empty())
{
localization_points.clear();
}
bool square_flag = false, local_points_flag = false;
double triangle_sides[3];
@@ -1564,9 +1573,9 @@ Point QRDecode::findClosestZeroPoint(Point2f original_point)
Point zero_point;
const int step = 2;
for (int i = orig_x - step; i >= 0 && i <= orig_x + step; i++)
for (int i = std::max(orig_x - step, 0); i >= 0 && i <= std::min(orig_x + step, bin_barcode.cols - 1); i++)
{
for (int j = orig_y - step; j >= 0 && j <= orig_y + step; j++)
for (int j = std::max(orig_y - step, 0); j >= 0 && j <= std::min(orig_y + step, bin_barcode.rows - 1); j++)
{
Point p(i, j);
value = bin_barcode.at<uint8_t>(p);
@@ -1944,7 +1953,7 @@ vector<vector<float> > QRDecode::computeSpline(const vector<int> &x_arr, const v
}
for (int i = 0; i < n - 1; i++)
{
h[i] = static_cast<float>(y_arr[i + 1] - y_arr[i]);
h[i] = static_cast<float>(y_arr[i + 1] - y_arr[i]) + std::numeric_limits<float>::epsilon();
}
for (int i = 1; i < n - 1; i++)
{
@@ -3071,7 +3080,10 @@ protected:
{
bool operator()(const Point2f& a, const Point2f& b) const
{
return a.y < b.y;
if (a.y != b.y)
return a.y < b.y;
else
return a.x < b.x;
}
};
struct compareSquare