Cherry pick failed to grab interface changes.

This commit is contained in:
Dan 2015-12-08 09:54:14 -05:00
parent 4f373a4284
commit 76760470f3

View File

@ -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;