Merge pull request #913 from janm399:2.4

2ccdf561 · Vadim Pisarevsky · OpenCV Buildbot · 24ca620c · 46b770f2 · 2ccdf561
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/include/opencv2/ocl/private/util.hpp +1 -1

modules/ocl/src/safe_call.hpp modules/ocl/src/safe_call.hpp +1 -1

未找到文件。
--- 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

--- a/modules/ocl/src/safe_call.hpp
+++ b/modules/ocl/src/safe_call.hpp
@@ -47,7 +47,7 @@
 #define __OPENCV_OPENCL_SAFE_CALL_HPP__

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