6 Commits

Author	SHA1	Message	Date
Roman Donchenko	e45fd939c2	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/ocl/src/cl_runtime/cl_runtime.cpp modules/ocl/src/cl_runtime/clamdblas_runtime.cpp modules/ocl/src/cl_runtime/clamdfft_runtime.cpp modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in	2014-01-20 15:10:19 +04:00
Dinar Valeev	711f07a34c	Use __vector instead of vector as suggests Eigen ... This fixes build on PowerPC where Eigen unsets vector, bool and pixel Signed-off-by: Dinar Valeev <dvaleev@suse.com>	2014-01-16 21:53:49 +01:00
ahb	49dfa5a17f	Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8 ... OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83 The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for "linux" instead of "__linux__" (cp. http://sourceforge.net/p/predef/wiki/OperatingSystems/) Adjust all other occurrences of "defined(linux)" as well.	2014-01-13 16:09:42 +01:00
Roman Donchenko	11c7053b0f	Fixed a -Wundef warning in cl_platform.h. ... _MSC_VER -> defined _MSC_VER. Fixes building with MinGW. Similar to fbc91c5ee.	2013-12-04 12:39:20 +04:00
Alexander Alekhin	fbc91c5ee9	ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)	2013-11-22 18:24:20 +04:00
Alexander Alekhin	9d380ecc08	added Khronos OpenCL 1.2 header files	2013-10-18 15:44:55 +04:00