Merge pull request #2077 from ilya-lavrenov:tapi_context

pull/2055/merge
Roman Donchenko 12 years ago committed by OpenCV Buildbot
commit 2d2312d742
  1. 8
      modules/core/src/ocl.cpp

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

Loading…
Cancel
Save