Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft

2013-05-29 17:57:14 +08:00
parent b4a4a05bdc 2ccdf56119
commit 006e4242b2
17 changed files with 358 additions and 432 deletions
--- a/modules/ocl/include/opencv2/ocl/private/util.hpp
+++ b/modules/ocl/include/opencv2/ocl/private/util.hpp
@@ -49,7 +49,7 @@
 #include "opencv2/ocl/ocl.hpp"

 #if defined __APPLE__
-#include <OpenCL/OpenCL.h>
+#include <OpenCL/opencl.h>
 #else
 #include <CL/opencl.h>
 #endif