Merge pull request #11984 from mshabunin:fix-static-1

This commit is contained in:
Alexander Alekhin
2018-07-17 15:40:48 +00:00
31 changed files with 79 additions and 23 deletions
+1 -1
View File
@@ -599,7 +599,7 @@ cvSetImagesForHaarClassifierCascade( CvHaarClassifierCascade* _cascade,
else
sum0 += hidfeature->rect[k].weight * tr.width * tr.height;
}
CV_Assert(area0 > 0);
hidfeature->rect[0].weight = (float)(-sum0/area0);
} /* l */
} /* j */
+2
View File
@@ -111,6 +111,7 @@ vector<Vec3d> QRDecode::searchVerticalLines()
for (size_t i = 0; i < test_lines.size(); i++) { length += test_lines[i]; }
CV_Assert(length > 0);
for (size_t i = 0; i < test_lines.size(); i++)
{
if (i == 2) { weight += fabs((test_lines[i] / length) - 3.0/7.0); }
@@ -182,6 +183,7 @@ vector<Point2f> QRDecode::separateHorizontalLines(vector<Vec3d> list_lines)
for (size_t i = 0; i < test_lines.size(); i++) { length += test_lines[i]; }
CV_Assert(length > 0);
for (size_t i = 0; i < test_lines.size(); i++)
{
if (i % 3 == 0) { weight += fabs((test_lines[i] / length) - 3.0/14.0); }