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

Aleksey-collab · Jan 19, 2022 · 6ae8103 · 6ae8103
2 parents 6778e19 + 25f2527
commit 6ae8103
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/modules/python/src2/pycompat.hpp b/modules/python/src2/pycompat.hpp
@@ -231,7 +231,12 @@ PyObject* pyopencv_from(const TYPE& src)
             ERROR_HANDLER; \
         } \
         CVPY_TYPE_INCREF(pyopencv_##NAME##_TypePtr); \
-        PyModule_AddObject(m, #WNAME, (PyObject *)pyopencv_##NAME##_TypePtr); \
+        if (PyModule_AddObject(m, #WNAME, (PyObject *)pyopencv_##NAME##_TypePtr) < 0) \
+        { \
+            printf("Failed to register a new type: " #WNAME  ", base (" #BASE ")\n"); \
+            Py_DECREF(pyopencv_##NAME##_TypePtr); \
+            ERROR_HANDLER; \
+        } \
     }
 
 //==================================================================================================
@@ -304,10 +309,15 @@ PyObject* pyopencv_from(const TYPE& src)
         pyopencv_##NAME##_TypePtr = PyType_FromSpecWithBases(&pyopencv_##NAME##_Spec, bases); \
         if (!pyopencv_##NAME##_TypePtr) \
         { \
-            printf("Failed to init: " #WNAME ", base (" #BASE ")" "\n"); \
+            printf("Failed to create type from spec: " #WNAME ", base (" #BASE ")\n"); \
+            ERROR_HANDLER; \
+        } \
+        if (PyModule_AddObject(m, #WNAME, (PyObject *)pyopencv_##NAME##_TypePtr) < 0) \
+        { \
+            printf("Failed to register a new type: " #WNAME  ", base (" #BASE ")\n"); \
+            Py_DECREF(pyopencv_##NAME##_TypePtr); \
             ERROR_HANDLER; \
         } \
-        PyModule_AddObject(m, #NAME, (PyObject *)pyopencv_##NAME##_TypePtr); \
     }
 
 // Debug module load:

diff --git a/platforms/winpack_dldt/2021.4.2/20220118-dldt-fix-msvs-compilation-21469.patch b/platforms/winpack_dldt/2021.4.2/20220118-dldt-fix-msvs-compilation-21469.patch
@@ -0,0 +1,12 @@
+diff --git a/inference-engine/src/plugin_api/caseless.hpp b/inference-engine/src/plugin_api/caseless.hpp
+index d8ce739..0dd8886 100644
+--- a/inference-engine/src/plugin_api/caseless.hpp
++++ b/inference-engine/src/plugin_api/caseless.hpp
+@@ -12,6 +12,7 @@
+ #include <algorithm>
+ #include <cctype>
+ #include <functional>
++#include <iterator>
+ #include <map>
+ #include <set>
+ #include <unordered_map>
diff --git a/platforms/winpack_dldt/2021.4.2/patch.config.py b/platforms/winpack_dldt/2021.4.2/patch.config.py
@@ -2,3 +2,4 @@
 applyPatch('20210630-dldt-pdb.patch')
 applyPatch('20210630-dldt-disable-multidevice-autoplugin.patch')
 applyPatch('20210630-dldt-vs-version.patch')
+applyPatch('20220118-dldt-fix-msvs-compilation-21469.patch')