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

2020-02-10 19:40:29 +03:00
parent 8a588f2c0b 1dd24eeec0
commit aa2777ed61
26 changed files with 1517 additions and 1313 deletions
@@ -982,6 +982,14 @@ PyObject* pyopencv_from(const String& value)
    return PyString_FromString(value.empty() ? "" : value.c_str());
 }

+#if CV_VERSION_MAJOR == 3
+template<>
+PyObject* pyopencv_from(const std::string& value)
+{
+    return PyString_FromString(value.empty() ? "" : value.c_str());
+}
+#endif
+
 template<>
 bool pyopencv_to(PyObject* obj, String &value, const ArgInfo& info)
 {