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

2021-01-31 17:44:15 +00:00
parent e250bae356 5ab4623c2a
commit 2b787eb4b8
9 changed files with 61 additions and 32 deletions
@@ -32,13 +32,14 @@

 #include <numpy/ndarrayobject.h>

+#include "opencv2/opencv_modules.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/utils/configuration.private.hpp"
 #include "opencv2/core/utils/logger.hpp"
 #include "opencv2/core/utils/tls.hpp"

 #include "pyopencv_generated_include.h"
 #include "opencv2/core/types_c.h"
-#include "opencv2/opencv_modules.hpp"
 #include "pycompat.hpp"
 #include <map>