potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33: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
2019-08-05 18:11:43 +00:00
parent 0757a51e2b 90ccd2f37c
commit 174b4ce29d
41 changed files with 423 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/mean.dispatch.cpp
+6
View File
@@ -17,6 +17,12 @@
#include "mean.simd.hpp"
#include "mean.simd_declarations.hpp" // defines CV_CPU_DISPATCH_MODES_ALL=AVX2,...,BASELINE based on CMakeLists.txt content
#undef HAVE_IPP
#undef CV_IPP_RUN_FAST
#define CV_IPP_RUN_FAST(f, ...)
#undef CV_IPP_RUN
#define CV_IPP_RUN(c, f, ...)
namespace cv {
#if defined HAVE_IPP