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

2026-07-29 23:33:05 +04:00 · 2019-10-29 20:46:51 +00:00
parent 278b4ca40c bad4e5c3eb
commit ea5499fa51
22 changed files with 1187 additions and 541 deletions
@@ -43,6 +43,8 @@
 #include "opencl_kernels_core.hpp"
 #include "umatrix.hpp"

+#include <opencv2/core/utils/tls.hpp>
+
 ///////////////////////////////// UMat implementation ///////////////////////////////

 namespace cv {