Fixed merge conflicts

4d86804f · Elena Gvozdeva · 7bd8f929 · 4d86804f
Commit 4d86804f authored Jan 23, 2014 by Elena Gvozdeva
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

test_match_template.cpp modules/imgproc/test/ocl/test_match_template.cpp +1 -1

No files found.
--- 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);