Revert "disable gpu Canny and HoughCircles perf tests:"
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Fri, 7 Feb 2014 10:55:06 +0000 (14:55 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Fri, 7 Feb 2014 10:55:06 +0000 (14:55 +0400)
This reverts commit dbce90692acd84fbf46bde4da4b1726049f42857.

modules/gpu/perf/perf_imgproc.cpp

index 8ad020d..1e59829 100644 (file)
@@ -672,7 +672,7 @@ PERF_TEST_P(Sz, ImgProc_ColumnSum,
 
 DEF_PARAM_TEST(Image_AppertureSz_L2gradient, string, int, bool);
 
-PERF_TEST_P(Image_AppertureSz_L2gradient, DISABLED_ImgProc_Canny,
+PERF_TEST_P(Image_AppertureSz_L2gradient, ImgProc_Canny,
             Combine(Values("perf/800x600.png", "perf/1280x1024.png", "perf/1680x1050.png"),
                     Values(3, 5),
                     Bool()))
@@ -1777,7 +1777,7 @@ PERF_TEST_P(Image, ImgProc_HoughLinesP,
 
 DEF_PARAM_TEST(Sz_Dp_MinDist, cv::Size, float, float);
 
-PERF_TEST_P(Sz_Dp_MinDist, DISABLED_ImgProc_HoughCircles,
+PERF_TEST_P(Sz_Dp_MinDist, ImgProc_HoughCircles,
             Combine(GPU_TYPICAL_MAT_SIZES,
                     Values(1.0f, 2.0f, 4.0f),
                     Values(1.0f)))