Commit 72e11f90 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot

Merge pull request #1370 from ilya-lavrenov:ocl_decor

parents 53818f0f 968c0954
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
// //
//M*/ //M*/
#ifndef __OPENCV_GPU_MATRIX_OPERATIONS_HPP__ #ifndef __OPENCV_OCL_MATRIX_OPERATIONS_HPP__
#define __OPENCV_GPU_MATRIX_OPERATIONS_HPP__ #define __OPENCV_OCL_MATRIX_OPERATIONS_HPP__
namespace cv namespace cv
{ {
...@@ -514,4 +514,4 @@ namespace cv ...@@ -514,4 +514,4 @@ namespace cv
} /* end of namespace cv */ } /* end of namespace cv */
#endif /* __OPENCV_GPU_MATRIX_OPERATIONS_HPP__ */ #endif /* __OPENCV_OCL_MATRIX_OPERATIONS_HPP__ */
...@@ -1709,4 +1709,4 @@ namespace cv ...@@ -1709,4 +1709,4 @@ namespace cv
# pragma warning( pop) # pragma warning( pop)
#endif #endif
#endif /* __OPENCV_GPU_HPP__ */ #endif /* __OPENCV_OCL_HPP__ */
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
#include "opencv2/ocl/ocl.hpp" #include "opencv2/ocl/ocl.hpp"
#include "opencv2/core/internal.hpp" #include "opencv2/core/internal.hpp"
//#include "opencv2/highgui/highgui.hpp"
#define __ATI__ #define __ATI__
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment