Merge pull request opencv#9606 from sovrasov:fix_gcc7_warnings

alalek · alalek · commit d9e364f31f9e · 2017-09-11T18:45:31.000Z
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
@@ -138,6 +138,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     add_extra_compiler_option(-Wno-delete-non-virtual-dtor)
     add_extra_compiler_option(-Wno-unnamed-type-template-args)
     add_extra_compiler_option(-Wno-comment)
+    add_extra_compiler_option(-Wno-implicit-fallthrough)
   endif()
   add_extra_compiler_option(-fdiagnostics-show-option)
 
diff --git a/modules/core/test/test_math.cpp b/modules/core/test/test_math.cpp
@@ -2883,7 +2883,9 @@ TEST(Core_KMeans, compactness)
         }
         EXPECT_NEAR(expected, compactness, expected * 1e-8);
         if (K == N)
+        {
             EXPECT_DOUBLE_EQ(compactness, 0.0);
+        }
     }
 }
 
@@ -3441,7 +3443,9 @@ TEST(Core_SoftFloat, pow32)
         softfloat x32(x.f);
         ASSERT_TRUE(pow(zero, -x32).isInf());
         if(x32 != one)
+        {
             ASSERT_EQ(pow(zero, x32), zero);
+        }
     }
 }
 
@@ -3577,7 +3581,9 @@ TEST(Core_SoftFloat, pow64)
 
         ASSERT_TRUE(pow(zero, -x64).isInf());
         if(x64 != one)
+        {
             ASSERT_EQ(pow(zero, x64), zero);
+        }
     }
 }
 
diff --git a/modules/videoio/test/test_video_io.cpp b/modules/videoio/test/test_video_io.cpp
@@ -178,7 +178,9 @@ class Videoio_Bunny : public Videoio_Test_Base, public testing::TestWithParam<st
         if (ext != "mpg")
         {
             if (count_prop > 0)
+            {
                 EXPECT_EQ(count_gt, count_prop);
+            }
         }
 
         int count_actual = 0;
@@ -193,7 +195,9 @@ class Videoio_Bunny : public Videoio_Test_Base, public testing::TestWithParam<st
             count_actual += 1;
         }
         if (count_prop > 0)
+        {
             EXPECT_NEAR(count_gt, count_actual, 1);
+        }
         else
             std::cout << "Frames counter is not available. Actual frames: " << count_actual << ". SKIP check." << std::endl;
     }

Original file line number	Diff line number	Diff line change
`@@ -2883,7 +2883,9 @@ TEST(Core_KMeans, compactness)`
`2883`	`2883`	`}`
`2884`	`2884`	`EXPECT_NEAR(expected, compactness, expected * 1e-8);`
`2885`	`2885`	`if (K == N)`
	`2886`	`+ {`
`2886`	`2887`	`EXPECT_DOUBLE_EQ(compactness, 0.0);`
	`2888`	`+ }`
`2887`	`2889`	`}`
`2888`	`2890`	`}`
`2889`	`2891`
`@@ -3441,7 +3443,9 @@ TEST(Core_SoftFloat, pow32)`
`3441`	`3443`	`softfloat x32(x.f);`
`3442`	`3444`	`ASSERT_TRUE(pow(zero, -x32).isInf());`
`3443`	`3445`	`if(x32 != one)`
	`3446`	`+ {`
`3444`	`3447`	`ASSERT_EQ(pow(zero, x32), zero);`
	`3448`	`+ }`
`3445`	`3449`	`}`
`3446`	`3450`	`}`
`3447`	`3451`
`@@ -3577,7 +3581,9 @@ TEST(Core_SoftFloat, pow64)`
`3577`	`3581`
`3578`	`3582`	`ASSERT_TRUE(pow(zero, -x64).isInf());`
`3579`	`3583`	`if(x64 != one)`
	`3584`	`+ {`
`3580`	`3585`	`ASSERT_EQ(pow(zero, x64), zero);`
	`3586`	`+ }`
`3581`	`3587`	`}`
`3582`	`3588`	`}`
`3583`	`3589`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,9 @@ class Videoio_Bunny : public Videoio_Test_Base, public testing::TestWithParam<st`
`178`	`178`	`if (ext != "mpg")`
`179`	`179`	`{`
`180`	`180`	`if (count_prop > 0)`
	`181`	`+ {`
`181`	`182`	`EXPECT_EQ(count_gt, count_prop);`
	`183`	`+ }`
`182`	`184`	`}`
`183`	`185`
`184`	`186`	`int count_actual = 0;`
`@@ -193,7 +195,9 @@ class Videoio_Bunny : public Videoio_Test_Base, public testing::TestWithParam<st`
`193`	`195`	`count_actual += 1;`
`194`	`196`	`}`
`195`	`197`	`if (count_prop > 0)`
	`198`	`+ {`
`196`	`199`	`EXPECT_NEAR(count_gt, count_actual, 1);`
	`200`	`+ }`
`197`	`201`	`else`
`198`	`202`	`std::cout << "Frames counter is not available. Actual frames: " << count_actual << ". SKIP check." << std::endl;`
`199`	`203`	`}`