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

ocl: cleanup workarounds

Browse Source
This commit is contained in:
Alexander Alekhin 2014-03-13 15:45:23 +04:00
parent 553673eeed
commit 48196ad10b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2476,23 +2476,23 @@ const Device& Context::device(size_t idx) const
Context& Context::getDefault(bool initialize) Context& Context::getDefault(bool initialize)
{ {
static Context ctx; static Context* ctx = new Context();
if(!ctx.p && haveOpenCL()) if(!ctx->p && haveOpenCL())
{ {
if (!ctx.p) if (!ctx->p)
ctx.p = new Impl(); ctx->p = new Impl();
if (initialize) if (initialize)
{ {
// do not create new Context right away. // do not create new Context right away.
// First, try to retrieve existing context of the same type. // First, try to retrieve existing context of the same type.
// In its turn, Platform::getContext() may call Context::create() // In its turn, Platform::getContext() may call Context::create()
// if there is no such context. // if there is no such context.
if (ctx.p->handle == NULL) if (ctx->p->handle == NULL)
ctx.p->setDefault(); ctx->p->setDefault();
} }
} }
return ctx; return *ctx;
} }
Program Context::getProg(const ProgramSource& prog, Program Context::getProg(const ProgramSource& prog,
@ -3122,7 +3122,12 @@ struct Program::Impl
{ {
if( handle ) if( handle )
{ {
#ifdef _WIN32
if (!cv::__termination)
#endif
{
clReleaseProgram(handle); clReleaseProgram(handle);
}
handle = NULL; handle = NULL;
} }
} }