Visual Studio 2015 warning and test fixes

2015-10-16 17:10:00 +03:00
parent 1648e9292c
commit 6e9d0d9a0c
54 changed files with 242 additions and 229 deletions
--- a/modules/imgproc/perf/perf_cvt_color.cpp
+++ b/modules/imgproc/perf/perf_cvt_color.cpp
@@ -263,6 +263,11 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u,

 #if defined(__APPLE__) && defined(HAVE_IPP)
    SANITY_CHECK(dst, _mode == CX_BGRA2HLS_FULL ? 2 : 1);
+#elif defined(_MSC_VER) && _MSC_VER >= 1900 /* MSVC 14 */
+    if (_mode == CX_Luv2BGRA)
+        SANITY_CHECK_NOTHING();
+    else
+        SANITY_CHECK(dst, 1);
 #else
    SANITY_CHECK(dst, 1);
 #endif