Merge branch 4.x

modules/core/include/opencv2/core/bindings_utils.hpp

@@ -335,23 +335,6 @@ namespace fs {
 //! @}  // core_utils
 }  // namespace cv::utils
 
-//! @cond IGNORED
-
-CV_WRAP static inline
-int setLogLevel(int level)
-{
-    // NB: Binding generators doesn't work with enums properly yet, so we define separate overload here
-    return cv::utils::logging::setLogLevel((cv::utils::logging::LogLevel)level);
-}
-
-CV_WRAP static inline
-int getLogLevel()
-{
-    return cv::utils::logging::getLogLevel();
-}
-
-//! @endcond IGNORED
-
 } // namespaces cv /  utils
 
 #endif // OPENCV_CORE_BINDINGS_UTILS_HPP

modules/core/include/opencv2/core/mat.inl.hpp

@@ -170,7 +170,10 @@ inline _InputArray::_InputArray(const std::vector<UMat>& vec) { init(+STD_VECTOR
 
 template<typename _Tp> inline
 _InputArray::_InputArray(const std::vector<_Tp>& vec)
-{ init(FIXED_TYPE + STD_VECTOR + traits::Type<_Tp>::value + ACCESS_READ, &vec); }
+{
+    CV_CheckLE(vec.size(), static_cast<size_t>(std::numeric_limits<int>::max()), "Must not be larger than INT_MAX");
+    init(FIXED_TYPE + STD_VECTOR + traits::Type<_Tp>::value + ACCESS_READ, &vec);
+}
 
 template<typename _Tp, std::size_t _Nm> inline
 _InputArray::_InputArray(const std::array<_Tp, _Nm>& arr)

modules/core/include/opencv2/core/utils/logger.hpp

@@ -22,9 +22,9 @@ namespace logging {
 /** Set global logging level
 @return previous logging level
 */
-CV_EXPORTS LogLevel setLogLevel(LogLevel logLevel);
+CV_EXPORTS_W LogLevel setLogLevel(LogLevel logLevel);
 /** Get global logging level */
-CV_EXPORTS LogLevel getLogLevel();
+CV_EXPORTS_W LogLevel getLogLevel();
 
 CV_EXPORTS void registerLogTag(cv::utils::logging::LogTag* plogtag);