Merge branch '2.4'

modules/core/include/opencv2/core/operations.hpp

@@ -86,6 +86,11 @@
 
 #include <limits>
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4127) //conditional expression is constant
+#endif
+
 namespace cv
 {
 
@@ -3950,5 +3955,9 @@ template<typename _Tp> inline void AlgorithmInfo::addParam(Algorithm& algo, cons
 
 }
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
 #endif // __cplusplus
 #endif