potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7854 from alalek:backports_2016

Browse Source 
(2.4) Backports from master branch (#7854)
This commit is contained in:
Alexander Alekhin
2016-12-15 18:09:44 +02:00
committed by GitHub
parent 49e6bb2993
commit cc09f5a7de
61 changed files with 1546 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/nonfree/src/surf_ocl.cpp
+1 -5
View File
@@ -273,11 +273,7 @@ private:
const oclMat _img; // make a copy for non-image2d_t supported platform
SURF_OCL_Invoker &operator= (const SURF_OCL_Invoker &right)
{
(*this) = right;
return *this;
} // remove warning C4512
SURF_OCL_Invoker &operator= (const SURF_OCL_Invoker &right); // = delete;
};
cv::ocl::SURF_OCL::SURF_OCL()