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

2026-07-31 00:03:03 +04:00 · 2022-06-04 19:10:35 +00:00
parent 9da9e8244b 53eda42da7
commit 583bd1a6e2
17 changed files with 340 additions and 94 deletions
@@ -365,6 +365,7 @@ extern CV_EXPORTS
 bool __termination;  // skip some cleanups, because process is terminating
                     // (for example, if ExitProcess() was already called)

+CV_EXPORTS
 cv::Mutex& getInitializationMutex();

 /// @brief Returns timestamp in nanoseconds since program launch