generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1997 from alalek:tapi_fix_memleaks

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-12-18 13:53:17 +04:00
committed by OpenCV Buildbot
parent 388d0ef182 9cb31e86ae
commit 59cab94fc7
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/src/ocl.cpp
View File

@@ -1524,6 +1524,7 @@ struct Device::Impl
Impl(void* d)
{
handle = (cl_device_id)d;
refcount = 1;
}
template<typename _TpCL, typename _TpOut>
@@ -2784,8 +2785,6 @@ public:
UMatData* defaultAllocate(int dims, const int* sizes, int type, void* data, size_t* step, int flags) const
{
UMatData* u = matStdAllocator->allocate(dims, sizes, type, data, step, flags);
u->urefcount = 1;
u->refcount = 0;
return u;
}
@@ -2827,7 +2826,6 @@ public:
u->data = 0;
u->size = total;
u->handle = handle;
u->urefcount = 1;
u->flags = flags0;
return u;
@@ -2866,7 +2864,6 @@ public:
}
if(accessFlags & ACCESS_WRITE)
u->markHostCopyObsolete(true);
CV_XADD(&u->urefcount, 1);
return true;
}
@@ -2905,6 +2902,9 @@ public:
if(!u)
return;
CV_Assert(u->urefcount >= 0);
CV_Assert(u->refcount >= 0);
// TODO: !!! when we add Shared Virtual Memory Support,
// this function (as well as the others) should be corrected
CV_Assert(u->handle != 0 && u->urefcount == 0);