Merge pull request #8204 from terfendail:ovx_tlcontext

modules/core/include/opencv2/core/openvx/ovx_defs.hpp

@@ -20,6 +20,12 @@
 #define IVX_USE_OPENCV
 #include "ivx.hpp"
 
+namespace cv{
+namespace ovx{
+// Get common thread local OpenVX context
+CV_EXPORTS_W ivx::Context& getOpenVXContext();
+}}
+
 #define CV_OVX_RUN(condition, func, ...)          \
     if (cv::useOpenVX() && (condition) && func)   \
     {                                             \

modules/core/include/opencv2/core/utility.hpp

@@ -627,6 +627,9 @@ public:
     virtual void  deleteDataInstance(void* pData) const = 0;
 
     int key_;
+
+public:
+    void cleanup(); //! Release created TLS data container objects. It is similar to release() call, but it keeps TLS container valid.
 };
 
 // Main TLS data class
@@ -638,13 +641,15 @@ public:
     inline ~TLSData()       { release();            } // Release key and delete associated data
     inline T* get() const   { return (T*)getData(); } // Get data associated with key
 
-     // Get data from all threads
+    // Get data from all threads
     inline void gather(std::vector<T*> &data) const
     {
         std::vector<void*> &dataVoid = reinterpret_cast<std::vector<void*>&>(data);
         gatherData(dataVoid);
     }
 
+    inline void cleanup() { TLSDataContainer::cleanup(); }
+
 private:
     virtual void* createDataInstance() const {return new T;}                // Wrapper to allocate data by template
     virtual void  deleteDataInstance(void* pData) const {delete (T*)pData;} // Wrapper to release data by template