mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16549 from rayonnant14:objdetect_QRCode_issue_memory_allocation

Browse Source
This commit is contained in:
Alexander Alekhin 2020-02-11 10:02:52 +00:00
commit aaf9297592
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/objdetect/src/qrcode.cpp
View File

@ -1312,7 +1312,7 @@ protected:
{
public:
ParallelSearch(vector< vector< Point2f > >& true_points_group_,
vector< vector< Point2f > >& loc_, int iter_, int* end_,
vector< vector< Point2f > >& loc_, int iter_, vector<int>& end_,
vector< vector< Vec3i > >& all_points_,
QRDetectMulti& cl_)
:
@ -1328,7 +1328,7 @@ protected:
vector< vector< Point2f > >& true_points_group;
vector< vector< Point2f > >& loc;
int iter;
int* end;
vector<int>& end;
vector< vector< Vec3i > >& all_points;
QRDetectMulti& cl;
};
@ -1940,7 +1940,7 @@ bool QRDetectMulti::checkSets(vector<vector<Point2f> >& true_points_group, vecto
return false;
int* set_size = new int[true_points_group.size()];
vector<int> set_size(true_points_group.size());
for (size_t i = 0; i < true_points_group.size(); i++)
{
set_size[i] = int(0.5 * (true_points_group[i].size() - 2 ) * (true_points_group[i].size() - 1));
@ -1978,7 +1978,7 @@ bool QRDetectMulti::checkSets(vector<vector<Point2f> >& true_points_group, vecto
transformation_points.resize(iter + true_points_group.size());
true_points_group_copy = true_points_group;
int* end = new int[true_points_group.size()];
vector<int> end(true_points_group.size());
for (size_t i = 0; i < true_points_group.size(); i++)
end[i] = iter + set_size[i];
ParallelSearch parallelSearch(true_points_group,