Merge pull request #785 from taka-no-me:split_c_cpp2

2013-04-09 08:53:49 +04:00
parent f03c7521c6 dd74a851f3
commit 913e6833d5
222 changed files with 2387 additions and 1986 deletions
--- a/modules/ocl/include/opencv2/ocl/private/util.hpp
+++ b/modules/ocl/include/opencv2/ocl/private/util.hpp
@@ -46,14 +46,14 @@
 #ifndef __OPENCV_OCL_PRIVATE_UTIL__
 #define __OPENCV_OCL_PRIVATE_UTIL__

-#include "opencv2/ocl.hpp"
-
 #if defined __APPLE__
 #include <OpenCL/OpenCL.h>
 #else
 #include <CL/opencl.h>
 #endif

+#include "opencv2/ocl.hpp"
+
 namespace cv
 {
    namespace ocl