Merge pull request #2177 from ilya-lavrenov:ocl_superres

9eca3ec8 · Andrey Pavlenko · OpenCV Buildbot · 494f7e36 · ac2e6139 · 9eca3ec8
Commit 9eca3ec8 authored Jan 21, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Jan 21, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

test_precomp.hpp modules/superres/test/test_precomp.hpp +2 -2

test_superres.cpp modules/superres/test/test_superres.cpp +2 -1

No files found.
--- a/modules/superres/test/test_precomp.hpp
+++ b/modules/superres/test/test_precomp.hpp
@@ -52,9 +52,9 @@
 #define __OPENCV_TEST_PRECOMP_HPP__

 #include "opencv2/opencv_modules.hpp"
-#include "opencv2/core.hpp"
-#include "opencv2/imgproc.hpp"
+#include "opencv2/core/ocl.hpp"
 #include "opencv2/ts.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/superres.hpp"
 #include "cvconfig.h"
 #include "input_array_utility.hpp"

--- a/modules/superres/test/test_superres.cpp
+++ b/modules/superres/test/test_superres.cpp
@@ -282,7 +282,8 @@ TEST_F(SuperResolution, BTVL1_CUDA)

 TEST_F(SuperResolution, BTVL1_OCL)
 {
-    RunTest(cv::superres::createSuperResolution_BTVL1_OCL());
+    if (cv::ocl::useOpenCL())
+        RunTest(cv::superres::createSuperResolution_BTVL1_OCL());
 }

 #endif