Merge pull request from ilya-lavrenov:ocl_superres

This commit is contained in:
Andrey Pavlenko 2014-01-21 17:05:50 +04:00 committed by OpenCV Buildbot
commit 9eca3ec8f6
2 changed files with 4 additions and 3 deletions

@ -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"

@ -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