From 4d86804f1120e655031a372d14f754ab756f45b5 Mon Sep 17 00:00:00 2001 From: Elena Gvozdeva Date: Thu, 23 Jan 2014 15:31:32 +0400 Subject: [PATCH] Fixed merge conflicts --- modules/imgproc/test/ocl/test_match_template.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/imgproc/test/ocl/test_match_template.cpp b/modules/imgproc/test/ocl/test_match_template.cpp index 7656a14466..782509cc91 100644 --- a/modules/imgproc/test/ocl/test_match_template.cpp +++ b/modules/imgproc/test/ocl/test_match_template.cpp @@ -75,7 +75,7 @@ PARAM_TEST_CASE(MatchTemplate, MatDepth, Channels, int, bool) virtual void generateTestData() { Size image_roiSize = randomSize(2, 100); - Size templ_roiSize = Size(randomInt(1,image_roiSize.width), randomInt(1,image_roiSize.height)); + Size templ_roiSize = Size(randomInt(1, image_roiSize.width), randomInt(1, image_roiSize.height)); Size result_roiSize = Size(image_roiSize.width - templ_roiSize.width + 1, image_roiSize.height - templ_roiSize.height + 1);