man/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in UMat::getMat()

2015-09-03 17:18:59 +03:00
parent 536634b1fe
commit cea2dafa0f
4 changed files with 82 additions and 39 deletions
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@@ -496,6 +496,7 @@ struct CV_EXPORTS UMatData
    void* handle;
    void* userdata;
    int allocatorFlags_;
+    int mapcount;
 };