Merge pull request opencv#8739 from terfendail:perf_accumulate_fix

vpisarev · vpisarev · commit 78815133dfc1 · 2017-05-17T14:07:56.000Z
diff --git a/modules/imgproc/perf/perf_accumulate.cpp b/modules/imgproc/perf/perf_accumulate.cpp
@@ -30,7 +30,7 @@ PERF_TEST_P( Size_MatType, Accumulate,
     declare.time(100);
     declare.in(src, WARMUP_RNG).out(dst);
 
-    TEST_CYCLE() accumulate(src, dst);
+    TEST_CYCLE() { dst.setTo(cv::Scalar::all(0)); accumulate(src, dst); }
 
     SANITY_CHECK(dst);
 }
@@ -60,7 +60,7 @@ PERF_TEST_P( Size_MatType, AccumulateSquare,
     declare.time(100);
     declare.in(src, WARMUP_RNG).out(dst);
 
-    TEST_CYCLE() accumulateSquare(src, dst);
+    TEST_CYCLE() { dst.setTo(cv::Scalar::all(0)); accumulateSquare(src, dst); }
 
     SANITY_CHECK(dst);
 }
@@ -90,7 +90,7 @@ PERF_TEST_P( Size_MatType, AccumulateWeighted,
     declare.time(100);
     declare.in(src, WARMUP_RNG).out(dst);
 
-    TEST_CYCLE() accumulateWeighted(src, dst, 0.314);
+    TEST_CYCLE() { dst.setTo(cv::Scalar::all(0)); accumulateWeighted(src, dst, 0.314); }
 
     SANITY_CHECK(dst);
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ PERF_TEST_P( Size_MatType, Accumulate,`
`30`	`30`	`declare.time(100);`
`31`	`31`	`declare.in(src, WARMUP_RNG).out(dst);`
`32`	`32`
`33`		`- TEST_CYCLE() accumulate(src, dst);`
	`33`	`+ TEST_CYCLE() { dst.setTo(cv::Scalar::all(0)); accumulate(src, dst); }`
`34`	`34`
`35`	`35`	`SANITY_CHECK(dst);`
`36`	`36`	`}`
`@@ -60,7 +60,7 @@ PERF_TEST_P( Size_MatType, AccumulateSquare,`
`60`	`60`	`declare.time(100);`
`61`	`61`	`declare.in(src, WARMUP_RNG).out(dst);`
`62`	`62`
`63`		`- TEST_CYCLE() accumulateSquare(src, dst);`
	`63`	`+ TEST_CYCLE() { dst.setTo(cv::Scalar::all(0)); accumulateSquare(src, dst); }`
`64`	`64`
`65`	`65`	`SANITY_CHECK(dst);`
`66`	`66`	`}`
`@@ -90,7 +90,7 @@ PERF_TEST_P( Size_MatType, AccumulateWeighted,`
`90`	`90`	`declare.time(100);`
`91`	`91`	`declare.in(src, WARMUP_RNG).out(dst);`
`92`	`92`
`93`		`- TEST_CYCLE() accumulateWeighted(src, dst, 0.314);`
	`93`	`+ TEST_CYCLE() { dst.setTo(cv::Scalar::all(0)); accumulateWeighted(src, dst, 0.314); }`
`94`	`94`
`95`	`95`	`SANITY_CHECK(dst);`
`96`	`96`	`}`