Merge pull request #5767 from dtmoodie:cpu_mat_memory_allocator

2015-12-10 14:32:04 +00:00
parent bb4b4acce5 237f33d4f0
commit d2e169929c
4 changed files with 29 additions and 10 deletions
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@@ -1895,6 +1895,8 @@ public:
    MatAllocator* allocator;
    //! and the standard allocator
    static MatAllocator* getStdAllocator();
+    static MatAllocator* getDefaultAllocator();
+    static void setDefaultAllocator(MatAllocator* allocator);

    //! interaction with UMat
    UMatData* u;