Merge pull request #2077 from ilya-lavrenov:tapi_context

2d2312d7 · Roman Donchenko · OpenCV Buildbot · 80816f68 · f221f57c · 2d2312d7
Commit 2d2312d7 authored Dec 27, 2013 by Roman Donchenko Committed by OpenCV Buildbot Dec 27, 2013
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ocl.cpp modules/core/src/ocl.cpp +5 -1

No files found.
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -2306,7 +2306,11 @@ bool Context2::create(int dtype0)

 Context2::~Context2()
 {
+    if (p)
+    {
        p->release();
+        p = NULL;
+    }
 }

 Context2::Context2(const Context2& c)
@@ -2329,7 +2333,7 @@ Context2& Context2::operator = (const Context2& c)

 void* Context2::ptr() const
 {
-    return p->handle;
+    return p == NULL ? NULL : p->handle;
 }

 size_t Context2::ndevices() const