All modules (except ocl and gpu) compiles and pass tests

2013-03-20 20:13:46 +04:00
parent 762aefd71b
commit 2ad7b97f1c
91 changed files with 606 additions and 604 deletions
--- a/modules/ocl/src/pyrup.cpp
+++ b/modules/ocl/src/pyrup.cpp
@@ -64,7 +64,7 @@ namespace cv

            Context *clCxt = src.clCxt;

-            const std::string kernelName = "pyrUp";
+            const cv::String kernelName = "pyrUp";

            std::vector< std::pair<size_t, const void *> > args;
            args.push_back( std::make_pair( sizeof(cl_mem), (void *)&src.data));