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 remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-10 00:04:29 +03:00
parent 80610ca054 c35c5a47df
commit dca657a2fd
107 changed files with 492 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/system.cpp
+2 -2
View File
@@ -2141,7 +2141,7 @@ void setUseIPP(bool flag)
#ifdef HAVE_IPP
data->useIPP = (getIPPSingleton().useIPP)?flag:false;
#else
(void)flag;
CV_UNUSED(flag);
data->useIPP = false;
#endif
}
@@ -2166,7 +2166,7 @@ void setUseIPP_NE(bool flag)
#ifdef HAVE_IPP
data->useIPP_NE = (getIPPSingleton().useIPP_NE)?flag:false;
#else
(void)flag;
CV_UNUSED(flag);
data->useIPP_NE = false;
#endif
}