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

2018-12-03 18:38:27 +03:00
parent 2dc5e245d0 aee865fec9
commit 2e0150e601
19 changed files with 301 additions and 158 deletions
@@ -17,6 +17,8 @@

 #include "opencv2/core/utils/trace.hpp"

+#include "opencv2/core/hal/hal.hpp"
+
 #include <stdarg.h> // for va_list

 #include "cvconfig.h"