Merge pull request #10605 from alalek:ocl_fix_deadlock

2018-01-18 13:39:36 +00:00
parent 1b0ff57562 cec700525c
commit 0def2dbb73
5 changed files with 78 additions and 15 deletions
@@ -545,14 +545,6 @@ struct CV_EXPORTS UMatData
 };


-struct CV_EXPORTS UMatDataAutoLock
-{
-    explicit UMatDataAutoLock(UMatData* u);
-    ~UMatDataAutoLock();
-    UMatData* u;
-};
-
-
 struct CV_EXPORTS MatSize
 {
    explicit MatSize(int* _p);
@@ -3911,9 +3911,6 @@ inline void UMatData::markDeviceCopyObsolete(bool flag)
        flags &= ~DEVICE_COPY_OBSOLETE;
 }

-inline UMatDataAutoLock::UMatDataAutoLock(UMatData* _u) : u(_u) { u->lock(); }
-inline UMatDataAutoLock::~UMatDataAutoLock() { u->unlock(); }
-
 //! @endcond

 } //cv