Fixed cmake and build issues when using Visual Studio 2015

2015-10-26 16:55:42 +03:00
parent 4552ca98c4
commit f49936a849
59 changed files with 520 additions and 460 deletions
--- a/modules/ocl/test/test_api.cpp
+++ b/modules/ocl/test/test_api.cpp
@@ -64,7 +64,7 @@ TEST(TestAPI, openCLExecuteKernelInterop)
    args.push_back( make_pair( sizeof(cl_mem), (void *) &gpuMat.data ));
    args.push_back( make_pair( sizeof(cl_mem), (void *) &gpuMatDst.data ));

-    size_t globalThreads[3] = { sz.width, 1, 1 };
+    size_t globalThreads[3] = { (size_t)sz.width, 1, 1 };
    cv::ocl::openCLExecuteKernelInterop(
        gpuMat.clCxt,
        program,