Cherry pick failed to grab interface changes.

pull/5767/head
Dan 9 years ago
parent 4f373a4284
commit 76760470f3
  1. 2
      modules/core/include/opencv2/core/mat.hpp

@ -1895,6 +1895,8 @@ public:
MatAllocator* allocator; MatAllocator* allocator;
//! and the standard allocator //! and the standard allocator
static MatAllocator* getStdAllocator(); static MatAllocator* getStdAllocator();
static MatAllocator* getDefaultAllocator();
static void setDefaultAllocator(MatAllocator* allocator);
//! interaction with UMat //! interaction with UMat
UMatData* u; UMatData* u;

Loading…
Cancel
Save