attempt to fix pure virtual call in Mat::deallocate

pull/2280/head
Ilya Lavrenov 11 years ago
parent 42ac3123ec
commit d957e8e40d
  1. 4
      modules/core/src/matrix.cpp
  2. 4
      modules/core/src/ocl.cpp

@ -222,8 +222,8 @@ public:
MatAllocator* Mat::getStdAllocator()
{
static StdMatAllocator allocator;
return &allocator;
static MatAllocator * allocator = new StdMatAllocator();
return allocator;
}
void swap( Mat& a, Mat& b )

@ -3959,8 +3959,8 @@ public:
MatAllocator* getOpenCLAllocator()
{
static OpenCLAllocator allocator;
return &allocator;
static MatAllocator * allocator = new OpenCLAllocator();
return allocator;
}
///////////////////////////////////////////// Utility functions /////////////////////////////////////////////////

Loading…
Cancel
Save