Merge pull request opencv#8365 from csukuangfj:patch-3

alalek · alalek · commit 5ea5d088928e · 2017-03-13T09:51:21.000Z
diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
@@ -3434,7 +3434,7 @@ int Kernel::set(int i, const KernelArg& arg)
             if( !(arg.flags & KernelArg::NO_SIZE) )
             {
                 int cols = u3d.cols*arg.wscale/arg.iwscale;
-                CV_OclDbgAssert(clSetKernelArg(p->handle, (cl_uint)i, sizeof(u3d.slices), &u3d.rows) == CL_SUCCESS);
+                CV_OclDbgAssert(clSetKernelArg(p->handle, (cl_uint)i, sizeof(u3d.slices), &u3d.slices) == CL_SUCCESS);
                 CV_OclDbgAssert(clSetKernelArg(p->handle, (cl_uint)(i+1), sizeof(u3d.rows), &u3d.rows) == CL_SUCCESS);
                 CV_OclDbgAssert(clSetKernelArg(p->handle, (cl_uint)(i+2), sizeof(u3d.cols), &cols) == CL_SUCCESS);
                 i += 3;

Original file line number	Diff line number	Diff line change
`@@ -3434,7 +3434,7 @@ int Kernel::set(int i, const KernelArg& arg)`
`3434`	`3434`	`if( !(arg.flags & KernelArg::NO_SIZE) )`
`3435`	`3435`	`{`
`3436`	`3436`	`int cols = u3d.cols*arg.wscale/arg.iwscale;`
`3437`		`- CV_OclDbgAssert(clSetKernelArg(p->handle, (cl_uint)i, sizeof(u3d.slices), &u3d.rows) == CL_SUCCESS);`
	`3437`	`+ CV_OclDbgAssert(clSetKernelArg(p->handle, (cl_uint)i, sizeof(u3d.slices), &u3d.slices) == CL_SUCCESS);`
`3438`	`3438`	`CV_OclDbgAssert(clSetKernelArg(p->handle, (cl_uint)(i+1), sizeof(u3d.rows), &u3d.rows) == CL_SUCCESS);`
`3439`	`3439`	`CV_OclDbgAssert(clSetKernelArg(p->handle, (cl_uint)(i+2), sizeof(u3d.cols), &cols) == CL_SUCCESS);`
`3440`	`3440`	`i += 3;`