disable some gpu tests if library was built without CUFFT(cherry picked from commit b4b929d27cc25822dd15b5b96b8d335c59d4408c)

pull/2570/head
Vladislav Vinogradov 11 years ago committed by Alexander Smorkalov
parent a7d0448faa
commit c319625a07
  1. 4
      modules/gpu/perf/perf_imgproc.cpp
  2. 4
      modules/gpu/test/test_imgproc.cpp

@ -851,6 +851,8 @@ PERF_TEST_P(Sz_Depth_Cn, ImgProc_BlendLinear,
}
}
#ifdef HAVE_CUFFT
//////////////////////////////////////////////////////////////////////
// Convolve
@ -1085,6 +1087,8 @@ PERF_TEST_P(Sz_Flags, ImgProc_Dft,
}
}
#endif
//////////////////////////////////////////////////////////////////////
// CornerHarris

@ -563,6 +563,8 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, Blend, testing::Combine(
testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4)),
WHOLE_SUBMAT));
#ifdef HAVE_CUFFT
////////////////////////////////////////////////////////
// Convolve
@ -1090,6 +1092,8 @@ GPU_TEST_P(Dft, R2CThenC2R)
INSTANTIATE_TEST_CASE_P(GPU_ImgProc, Dft, ALL_DEVICES);
#endif
///////////////////////////////////////////////////////////////////////////////////////////////////////
// CornerHarris

Loading…
Cancel
Save