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

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

Browse Source
This commit is contained in:
Alexander Alekhin
2019-04-19 15:43:58 +03:00
parent 1f517b8a02 3abae3c511
commit c024edb9a8
40 changed files with 332 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ts/src/ts.cpp
+1
View File
@@ -755,6 +755,7 @@ static uint64_t memory_usage_base_opencl = 0;
void testSetUp()
{
fflush(stdout); fflush(stderr);
cv::ipp::setIppStatus(0);
cv::theRNG().state = cvtest::param_seed;
cv::setNumThreads(cvtest::testThreads);