Commit a048cb9f authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #9338 from dkurt:fix_ocl

parents 87598c87 41519d3a
...@@ -584,7 +584,6 @@ public: ...@@ -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);
......
...@@ -2143,7 +2143,7 @@ int Kernel::set(int i, const Image2D& image2D) ...@@ -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)
......
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