Merge pull request #2984 from cambyse:2.4

2014-07-18 10:05:22 +00:00 · 2014-07-18 10:05:22 +00:00 · e90c233551
commit e90c233551
parent 06897dbdb5 5a5a487612
1 changed files with 2 additions and 0 deletions
--- 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;
    }