Merge pull request #1370 from ilya-lavrenov:ocl_decor

12 years ago · 72e11f9066
parent 53818f0f5f 968c095403
commit 72e11f9066
3 changed files with 4 additions and 5 deletions
--- a/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
+++ b/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
@ -41,8 +41,8 @@
 //
 //M*/

-#ifndef __OPENCV_GPU_MATRIX_OPERATIONS_HPP__
-#define __OPENCV_GPU_MATRIX_OPERATIONS_HPP__
+#ifndef __OPENCV_OCL_MATRIX_OPERATIONS_HPP__
+#define __OPENCV_OCL_MATRIX_OPERATIONS_HPP__

 namespace cv
 {
@ -514,4 +514,4 @@ namespace cv

 } /* end of namespace cv */

-#endif /* __OPENCV_GPU_MATRIX_OPERATIONS_HPP__ */
+#endif /* __OPENCV_OCL_MATRIX_OPERATIONS_HPP__ */
--- a/modules/ocl/include/opencv2/ocl/ocl.hpp
+++ b/modules/ocl/include/opencv2/ocl/ocl.hpp
@ -1709,4 +1709,4 @@ namespace cv
 #  pragma warning( pop)
 #endif

-#endif /* __OPENCV_GPU_HPP__ */
+#endif /* __OPENCV_OCL_HPP__ */
--- a/modules/ocl/src/precomp.hpp
+++ b/modules/ocl/src/precomp.hpp
@ -70,7 +70,6 @@
 #include "opencv2/ocl/ocl.hpp"

 #include "opencv2/core/internal.hpp"
-//#include "opencv2/highgui/highgui.hpp"

 #define __ATI__