third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-12-03 18:38:27 +03:00
parent 2dc5e245d0 aee865fec9
commit 2e0150e601
19 changed files with 301 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/src/qrcode.cpp
+2 -3
View File
@@ -959,8 +959,7 @@ bool QRDecode::samplingForVersion()
const int delta_rows = cvRound((postIntermediate.rows * 1.0) / version_size);
const int delta_cols = cvRound((postIntermediate.cols * 1.0) / version_size);
vector<double> listFrequencyElem(version_size * version_size, 0);
int k = 0;
vector<double> listFrequencyElem;
for (int r = 0; r < postIntermediate.rows; r += delta_rows)
{
for (int c = 0; c < postIntermediate.cols; c += delta_cols)
@@ -969,7 +968,7 @@ bool QRDecode::samplingForVersion()
Range(r, min(r + delta_rows, postIntermediate.rows)),
Range(c, min(c + delta_cols, postIntermediate.cols)));
const double frequencyElem = (countNonZero(tile) * 1.0) / tile.total();
listFrequencyElem[k] = frequencyElem; k++;
listFrequencyElem.push_back(frequencyElem);
}
}