Merge pull request opencv#9507 from delftrobotics-forks:restrict-initializer-list-constructor

alalek · alalek · commit 91ef0b953766 · 2017-08-29T18:09:11.000Z
diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp
@@ -53,6 +53,10 @@
 
 #include "opencv2/core/bufferpool.hpp"
 
+#ifdef CV_CXX11
+#include <type_traits>
+#endif
+
 namespace cv
 {
 
@@ -988,7 +992,8 @@ class CV_EXPORTS Mat
 #ifdef CV_CXX11
     /** @overload
     */
-    template<typename _Tp> explicit Mat(const std::initializer_list<_Tp> list);
+    template<typename _Tp, typename = typename std::enable_if<std::is_arithmetic<_Tp>::value>::type>
+    explicit Mat(const std::initializer_list<_Tp> list);
 #endif
 
 #ifdef CV_CXX_STD_ARRAY
diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -575,7 +575,7 @@ Mat::Mat(const std::vector<_Tp>& vec, bool copyData)
 }
 
 #ifdef CV_CXX11
-template<typename _Tp> inline
+template<typename _Tp, typename> inline
 Mat::Mat(const std::initializer_list<_Tp> list)
     : flags(MAGIC_VAL | DataType<_Tp>::type | CV_MAT_CONT_FLAG), dims(2), rows((int)list.size()),
       cols(1), data(0), datastart(0), dataend(0), datalimit(0), allocator(0), u(0), size(&rows), step(0)

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ Mat::Mat(const std::vector<_Tp>& vec, bool copyData)`
`575`	`575`	`}`
`576`	`576`
`577`	`577`	`#ifdef CV_CXX11`
`578`		`-template<typename _Tp> inline`
	`578`	`+template<typename _Tp, typename> inline`
`579`	`579`	`Mat::Mat(const std::initializer_list<_Tp> list)`
`580`	`580`	`: flags(MAGIC_VAL \| DataType<_Tp>::type \| CV_MAT_CONT_FLAG), dims(2), rows((int)list.size()),`
`581`	`581`	`cols(1), data(0), datastart(0), dataend(0), datalimit(0), allocator(0), u(0), size(&rows), step(0)`