Merge pull request #3086 from fpuja:pragma_warning4127_fixing

11 years ago · dea40e5e99
parent 5febdae36a dbb0fcdc7a
commit dea40e5e99
1 changed files with 7 additions and 1 deletions
--- a/modules/core/include/opencv2/core/cvstd.inl.hpp
+++ b/modules/core/include/opencv2/core/cvstd.inl.hpp
@ -219,8 +219,14 @@ template<typename _Tp, int n> static inline
 std::ostream& operator << (std::ostream& out, const Vec<_Tp, n>& vec)
 {
    out << "[";
-
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4127 )
+#endif
    if(Vec<_Tp, n>::depth < CV_32F)
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
    {
        for (int i = 0; i < n - 1; ++i) {
            out << (int)vec[i] << ", ";