Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup

2014-02-17 17:53:05 +04:00
parent 47d9b933f6 9b627a5e9f
commit 9885a671ee
6 changed files with 258 additions and 254 deletions
--- a/modules/ts/include/opencv2/ts/ocl_perf.hpp
+++ b/modules/ts/include/opencv2/ts/ocl_perf.hpp
@@ -45,8 +45,6 @@
 #include "ocl_test.hpp"
 #include "ts_perf.hpp"

-#ifdef HAVE_OPENCL
-
 namespace cvtest {
 namespace ocl {

@@ -130,6 +128,4 @@ using namespace perf;
 } // namespace cvtest::ocl
 } // namespace cvtest

-#endif // HAVE_OPENCL
-
 #endif // __OPENCV_TS_OCL_PERF_HPP__