Merge pull request opencv#9338 from dkurt:fix_ocl

alalek · alalek · commit a048cb9f0d5a · 2017-08-14T12:56:07.000Z
diff --git a/modules/core/include/opencv2/core/ocl.hpp b/modules/core/include/opencv2/core/ocl.hpp
@@ -584,7 +584,6 @@ class CV_EXPORTS Program
     Program();
     Program(const ProgramSource& src,
             const String& buildflags, String& errmsg);
-    explicit Program(const String& buf);
     Program(const Program& prog);
 
     Program& operator = (const Program& prog);
diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
@@ -2143,7 +2143,7 @@ int Kernel::set(int i, const Image2D& image2D)
 
 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)

Original file line number	Diff line number	Diff line change
`@@ -2143,7 +2143,7 @@ int Kernel::set(int i, const Image2D& image2D)`
`2143`	`2143`
`2144`	`2144`	`int Kernel::set(int i, const UMat& m)`
`2145`	`2145`	`{`
`2146`		`- return set(i, KernelArg(KernelArg::READ_WRITE, (UMat*)&m, 0, 0));`
	`2146`	`+ return set(i, KernelArg(KernelArg::READ_WRITE, (UMat*)&m));`
`2147`	`2147`	`}`
`2148`	`2148`
`2149`	`2149`	`int Kernel::set(int i, const KernelArg& arg)`