mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9338 from dkurt:fix_ocl

Browse Source
This commit is contained in:
Alexander Alekhin 2017-08-14 12:56:07 +00:00
commit a048cb9f0d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/ocl.hpp
View File

@ -584,7 +584,6 @@ public:
Program(); Program();
Program(const ProgramSource& src, Program(const ProgramSource& src,
const String& buildflags, String& errmsg); const String& buildflags, String& errmsg);
explicit Program(const String& buf);
Program(const Program& prog); Program(const Program& prog);
Program& operator = (const Program& prog); Program& operator = (const Program& prog);

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

@ -2143,7 +2143,7 @@ int Kernel::set(int i, const Image2D& image2D)
int Kernel::set(int i, const UMat& m) int Kernel::set(int i, const UMat& m)
{ {
return set(i, KernelArg(KernelArg::READ_WRITE, (UMat*)&m, 0, 0)); return set(i, KernelArg(KernelArg::READ_WRITE, (UMat*)&m));
} }
int Kernel::set(int i, const KernelArg& arg) int Kernel::set(int i, const KernelArg& arg)