Merge branch 'gpu-tests'

2012-08-20 11:29:40 +04:00
parent e7f4dd1a2e ec7f9566e0
commit 3956e42507
57 changed files with 5056 additions and 7741 deletions
--- a/modules/gpu/test/test_imgproc.cpp
+++ b/modules/gpu/test/test_imgproc.cpp
@@ -39,7 +39,9 @@
 //
 //M*/

-#include "precomp.hpp"
+#include "test_precomp.hpp"
+
+#ifdef HAVE_CUDA

 namespace {

@@ -1186,3 +1188,5 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, HoughLines, testing::Combine(
                    std::string("../cv/shared/pic6.png"))));

 } // namespace
+
+#endif // HAVE_CUDA