Fixed merge conflicts

11 years ago · 4d86804f11
parent 7bd8f9294d
commit 4d86804f11
1 changed files with 1 additions and 1 deletions
--- 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);