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

2021-02-06 00:43:06 +00:00
parent a9c954e821 0be18f5cb0
commit 6b474c4051
23 changed files with 202 additions and 82 deletions
@@ -209,6 +209,11 @@ catch (const cv::Exception &e) \
 { \
    pyRaiseCVException(e); \
    return 0; \
+} \
+catch (const std::exception &e) \
+{ \
+    PyErr_SetString(opencv_error, e.what()); \
+    return 0; \
 }

 using namespace cv;