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

Merge pull request #2077 from ilya-lavrenov:tapi_context

Browse Source
This commit is contained in:
Roman Donchenko 2013-12-27 20:23:56 +04:00 committed by OpenCV Buildbot
commit 2d2312d742
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2306,7 +2306,11 @@ bool Context2::create(int dtype0)
Context2::~Context2() Context2::~Context2()
{ {
p->release(); if (p)
{
p->release();
p = NULL;
}
} }
Context2::Context2(const Context2& c) Context2::Context2(const Context2& c)
@ -2329,7 +2333,7 @@ Context2& Context2::operator = (const Context2& c)
void* Context2::ptr() const void* Context2::ptr() const
{ {
return p->handle; return p == NULL ? NULL : p->handle;
} }
size_t Context2::ndevices() const size_t Context2::ndevices() const