Skip to content

O
opencv
Commit 5bb6d366 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #982 from pengx17:2.4_fix_two_bugs

parents 462047d1 d9ab22e4
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
modules/ocl/src/initialization.cpp
View file @ 5bb6d366
...@@ -930,8 +930,6 @@ namespace cv ...@@ -930,8 +930,6 @@ namespace cv
clCxt.reset(new Context); clCxt.reset(new Context);
std::vector<Info> oclinfo; std::vector<Info> oclinfo;
CV_Assert(getDevice(oclinfo, CVCL_DEVICE_TYPE_ALL) > 0); CV_Assert(getDevice(oclinfo, CVCL_DEVICE_TYPE_ALL) > 0);
oclinfo[0].impl->setDevice(0, 0, 0);
clCxt.get()->impl = oclinfo[0].impl->copy();
*((volatile int*)&val) = 1; *((volatile int*)&val) = 1;
} }
...@@ -1056,7 +1054,7 @@ BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID ) ...@@ -1056,7 +1054,7 @@ BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID )
Context* cv_ctx = Context::getContext(); Context* cv_ctx = Context::getContext();
if(cv_ctx) if(cv_ctx)
{ {
cl_context ctx = (cl_context)&(cv_ctx->impl->oclcontext); cl_context ctx = cv_ctx->impl->oclcontext;
if(ctx) if(ctx)
openCLSafeCall(clReleaseContext(ctx)); openCLSafeCall(clReleaseContext(ctx));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment