Merge pull request #1562 from ilya-lavrenov:ocl_integral

modules/ocl/perf/perf_imgproc.cpp

@@ -198,7 +198,7 @@ PERF_TEST_P(cornerHarrisFixture, cornerHarris,
 
 typedef TestBaseWithParam<Size> integralFixture;
 
-PERF_TEST_P(integralFixture, DISABLED_integral, OCL_TYPICAL_MAT_SIZES) // TODO does not work properly
+PERF_TEST_P(integralFixture, integral, OCL_TYPICAL_MAT_SIZES)
 {
     const Size srcSize = GetParam();
 

modules/ocl/src/haar.cpp

@@ -1141,7 +1141,6 @@ void cv::ocl::OclCascadeClassifierBuf::detectMultiScale(oclMat &gimg, CV_OUT std
         CvSize sz;
 
         cv::Rect roi, roi2;
-        cv::Mat imgroi, imgroisq;
         cv::ocl::oclMat resizeroi, gimgroi, gimgroisq;
 
         for( int i = 0; i < m_loopcount; i++ )

modules/ocl/test/test_imgproc.cpp

@@ -579,7 +579,19 @@ TEST_P(cornerHarris, Mat)
 
 struct integral : ImgprocTestBase {};
 
-TEST_P(integral, Mat)
+TEST_P(integral, Mat1)
+{
+    for(int j = 0; j < LOOP_TIMES; j++)
+    {
+        random_roi();
+
+        cv::ocl::integral(clmat1_roi, cldst_roi);
+        cv::integral(mat1_roi, dst_roi);
+        Near(0);
+    }
+}
+
+TEST_P(integral, Mat2)
 {
     for(int j = 0; j < LOOP_TIMES; j++)
     {