Merge pull request #1519 from ilya-lavrenov:ocl_minMax

2013-10-01 20:16:47 +04:00
parent 8c15d27619 4322c47bb2
commit 154fe4f657
11 changed files with 874 additions and 1116 deletions
--- a/modules/ocl/include/opencv2/ocl/ocl.hpp
+++ b/modules/ocl/include/opencv2/ocl/ocl.hpp
@@ -584,7 +584,8 @@ namespace cv

        CV_EXPORTS void cvtColor(const oclMat &src, oclMat &dst, int code , int dcn = 0);

-        CV_EXPORTS void setIdentity(oclMat& src, double val);
+        //! initializes a scaled identity matrix
+        CV_EXPORTS void setIdentity(oclMat& src, const Scalar & val = Scalar(1));

        //////////////////////////////// Filter Engine ////////////////////////////////