diff --git a/modules/objdetect/perf/opencl/perf_cascades.cpp b/modules/objdetect/perf/opencl/perf_cascades.cpp index 4af2428f2..d20dd303c 100644 --- a/modules/objdetect/perf/opencl/perf_cascades.cpp +++ b/modules/objdetect/perf/opencl/perf_cascades.cpp @@ -1,6 +1,8 @@ #include "perf_precomp.hpp" #include +#include "opencv2/ts/ocl_perf.hpp" + using namespace std; using namespace cv; using namespace perf; @@ -10,14 +12,14 @@ using std::tr1::get; typedef std::tr1::tuple Cascade_Image_MinSize_t; typedef perf::TestBaseWithParam Cascade_Image_MinSize; -PERF_TEST_P( Cascade_Image_MinSize, CascadeClassifier_UMat, - testing::Combine( - testing::Values( string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt.xml"), - string("cv/cascadeandhog/cascades/lbpcascade_frontalface.xml") ), - testing::Values( string("cv/shared/lena.png"), - string("cv/cascadeandhog/images/bttf301.png"), - string("cv/cascadeandhog/images/class57.png") ), - testing::Values(30, 64, 90) ) ) +OCL_PERF_TEST_P(Cascade_Image_MinSize, CascadeClassifier, + testing::Combine( + testing::Values( string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt.xml"), + string("cv/cascadeandhog/cascades/lbpcascade_frontalface.xml") ), + testing::Values( string("cv/shared/lena.png"), + string("cv/cascadeandhog/images/bttf301.png"), + string("cv/cascadeandhog/images/class57.png") ), + testing::Values(30, 64, 90) ) ) { const string cascasePath = get<0>(GetParam()); const string imagePath = get<1>(GetParam()); @@ -42,6 +44,7 @@ PERF_TEST_P( Cascade_Image_MinSize, CascadeClassifier_UMat, while(next()) { faces.clear(); + cvtest::ocl::perf::safeFinish(); startTimer(); cc.detectMultiScale(uimg, faces, 1.1, 3, 0, minSize);