generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1370 from ilya-lavrenov:ocl_decor

Browse Source
This commit is contained in:
Roman Donchenko
2013-08-30 12:21:26 +04:00
committed by OpenCV Buildbot
parent 53818f0f5f 968c095403
commit 72e11f9066
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
View File

@@ -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__ */

2
modules/ocl/include/opencv2/ocl/ocl.hpp
View File

@@ -1709,4 +1709,4 @@ namespace cv
# pragma warning( pop)
#endif
#endif /* __OPENCV_GPU_HPP__ */
#endif /* __OPENCV_OCL_HPP__ */

1
modules/ocl/src/precomp.hpp
View File

@@ -70,7 +70,6 @@
#include "opencv2/ocl/ocl.hpp"
#include "opencv2/core/internal.hpp"
//#include "opencv2/highgui/highgui.hpp"
#define __ATI__