Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 27 Nov 2013 14:08:11 +0000 (18:08 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 27 Nov 2013 14:08:11 +0000 (18:08 +0400)
1  2 
modules/ts/include/opencv2/ts/ocl_test.hpp

@@@ -302,9 -277,11 +302,11 @@@ IMPLEMENT_PARAM_CLASS(Channels, int
  #define OCL_OFF(fn) cv::ocl::setUseOpenCL(false); fn
  #define OCL_ON(fn) cv::ocl::setUseOpenCL(true); fn
  
 -#define OCL_ALL_DEPTHS Values(CV_8U, CV_8S, CV_16U, CV_16S, CV_32S, CV_32F, CV_64F)
 +#define OCL_ALL_DEPTHS Values(CV_8U, CV_8S, CV_16U, CV_16S, CV_32S, CV_32F)
  #define OCL_ALL_CHANNELS Values(1, 2, 3, 4)
  
+ CV_ENUM(Interpolation, INTER_NEAREST, INTER_LINEAR, INTER_CUBIC)
  #define OCL_INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
      INSTANTIATE_TEST_CASE_P(OCL_ ## prefix, test_case_name, generator)