Merge pull request #2984 from cambyse:2.4

e90c2335 · Vadim Pisarevsky · 06897dbd · 5a5a4876 · e90c2335
Commit e90c2335 authored Jul 18, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mat.hpp modules/core/include/opencv2/core/mat.hpp +2 -0

No files found.
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@@ -684,6 +684,8 @@ template<typename _Tp> inline void Mat::push_back(const _Tp& elem)
 {
    if( !data )
    {
+        CV_Assert((type()==0) || (DataType<_Tp>::type == type()));
+
        *this = Mat(1, 1, DataType<_Tp>::type, (void*)&elem).clone();
        return;
    }