From: Andrey Pavlenko Date: Wed, 27 Nov 2013 14:08:11 +0000 (+0400) Subject: Merge pull request #1867 from ilya-lavrenov:ocl_resize_master X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~835 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41ae5d5f66eec1843f17d3ef87d6e508f449ef4d;p=profile%2Fivi%2Fopencv.git Merge pull request #1867 from ilya-lavrenov:ocl_resize_master --- 41ae5d5f66eec1843f17d3ef87d6e508f449ef4d diff --cc modules/ts/include/opencv2/ts/ocl_test.hpp index eb4e2a0,b80245a..008ce37 --- a/modules/ts/include/opencv2/ts/ocl_test.hpp +++ b/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)