fixed a few bugs in: Mat::reshape, Mat(CvMat*) constructor, element access, copying nd array etc.

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

@@ -90,7 +90,6 @@ typedef Mat MatND;
 
 class CV_EXPORTS MatExpr;
 class CV_EXPORTS MatOp_Base;
-class CV_EXPORTS VectorArg;
 class CV_EXPORTS MatArg;
 class CV_EXPORTS MatConstIterator;
 
@@ -1257,11 +1256,11 @@ static inline size_t getElemSize(int type) { return CV_ELEM_SIZE(type); }
    Custom array allocator
  
 */
-class CV_EXPORTS ArrayAllocator
+class CV_EXPORTS MatAllocator
 {
 public:
-    ArrayAllocator() {}
+    MatAllocator() {}
-    virtual ~ArrayAllocator() {}
+    virtual ~MatAllocator() {}
     virtual void allocate(int dims, const int* sizes, int type, int*& refcount,
                           uchar*& datastart, uchar*& data, size_t* step) = 0;
     virtual void deallocate(int* refcount, uchar* datastart, uchar* data) = 0;
@@ -1763,7 +1762,7 @@ public:
     uchar* datalimit;
     
     //! custom allocator
-    ArrayAllocator* allocator;
+    MatAllocator* allocator;
     
     struct CV_EXPORTS MSize
     {
@@ -1837,6 +1836,9 @@ public:
     uint64 state;
 };
     
+    
+
+
 /*!
  Termination criteria in iterative algorithms
  */
@@ -2331,7 +2333,8 @@ public:
 
 //! converts elliptic arc to a polygonal curve
 CV_EXPORTS void ellipse2Poly( Point center, Size axes, int angle,
-                              int arcStart, int arcEnd, int delta, CV_OUT vector<Point>& pts );
+                              int arcStart, int arcEnd, int delta,
+                              CV_OUT vector<Point>& pts );
 
 enum
 {

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

@@ -172,8 +172,7 @@ inline Mat::Mat(Size _sz, int _type, void* _data, size_t _step)
 inline Mat::Mat(const CvMat* m, bool copyData)
     : flags(MAGIC_VAL + (m->type & (CV_MAT_TYPE_MASK|CV_MAT_CONT_FLAG))),
     dims(2), rows(m->rows), cols(m->cols), data(m->data.ptr), refcount(0),
-    datastart(0), dataend(0),
+    datastart(m->data.ptr), allocator(0), size(&rows)
-    allocator(0), size(&rows)
 {
     if( !copyData )
     {
@@ -544,17 +543,41 @@ template<typename _Tp> inline const _Tp& Mat::at(Point pt) const
 }
 
 template<typename _Tp> inline _Tp& Mat::at(int i0)
-{ return *(_Tp*)ptr(i0); }
+{
+    CV_DbgAssert( dims <= 2 && data && (size.p[0] == 1 || size.p[1] == 1) &&
+                 (unsigned)i0 < (unsigned)(size.p[0] + size.p[1] - 1) &&
+                 elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type) );
+    return *(_Tp*)(data + step.p[size.p[0]==1]*i0);
+}
+    
 template<typename _Tp> inline const _Tp& Mat::at(int i0) const
-{ return *(const _Tp*)ptr(i0); }
+{
+    CV_DbgAssert( dims <= 2 && data && (size.p[0] == 1 || size.p[1] == 1) &&
+                 (unsigned)i0 < (unsigned)(size.p[0] + size.p[1] - 1) &&
+                 elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type) );
+    return *(_Tp*)(data + step.p[size.p[0]==1]*i0);
+}
+    
 template<typename _Tp> inline _Tp& Mat::at(int i0, int i1, int i2)
-{ return *(_Tp*)ptr(i0, i1, i2); }
+{
+    CV_DbgAssert( elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type) );
+    return *(_Tp*)ptr(i0, i1, i2);
+}
 template<typename _Tp> inline const _Tp& Mat::at(int i0, int i1, int i2) const
-{ return *(const _Tp*)ptr(i0, i1, i2); }
+{
+    CV_DbgAssert( elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type) );
+    return *(const _Tp*)ptr(i0, i1, i2);
+}
 template<typename _Tp> inline _Tp& Mat::at(const int* idx)
-{ return *(_Tp*)ptr(idx); }
+{
+    CV_DbgAssert( elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type) );
+    return *(_Tp*)ptr(idx);
+}
 template<typename _Tp> inline const _Tp& Mat::at(const int* idx) const
-{ return *(const _Tp*)ptr(idx); }
+{
+    CV_DbgAssert( elemSize() == CV_ELEM_SIZE(DataType<_Tp>::type) );
+    return *(const _Tp*)ptr(idx);
+}
     
     
 template<typename _Tp> inline MatConstIterator_<_Tp> Mat::begin() const
@@ -689,6 +712,8 @@ static inline Mat cvarrToMatND(const CvArr* arr, bool copyData=false, int coiMod
     return cvarrToMat(arr, copyData, true, coiMode);
 }
 
+///////////////////////////////////////////// SVD //////////////////////////////////////////////////////
+
 inline SVD::SVD() {}
 inline SVD::SVD( const Mat& m, int flags ) { operator ()(m, flags); }
 inline void SVD::solveZ( const Mat& m, Mat& dst )
@@ -1015,6 +1040,7 @@ process( const Mat_<T1>& m1, const Mat_<T2>& m2, Mat_<T3>& m3, Op op )
     }
 }
 
+//////////////////////////////////// Matrix Expressions /////////////////////////////////////////
 
 class CV_EXPORTS MatOp
 {    
@@ -1526,7 +1552,7 @@ template<typename _Tp> inline MatExpr Mat_<_Tp>::eye(Size sz)
     return Mat::eye(sz, DataType<_Tp>::type);
 }    
     
-//////////// Iterators & Comma initializers //////////////////
+//////////////////////////////// Iterators & Comma initializers //////////////////////////////////
 
 inline MatConstIterator::MatConstIterator()
     : m(0), elemSize(0), ptr(0), sliceStart(0), sliceEnd(0) {}

modules/core/src/array.cpp

@@ -304,7 +304,11 @@ cvCloneMatND( const CvMatND* src )
     if( src->data.ptr )
     {
         cvCreateData( dst );
-        cvCopy( src, dst );
+        cv::Mat _src(src), _dst(dst);
+        uchar* data0 = dst->data.ptr;
+        _src.copyTo(_dst);
+        CV_Assert(_dst.data == data0);
+        //cvCopy( src, dst );
     }
 
     return dst;

modules/core/src/matrix.cpp

@@ -511,6 +511,10 @@ void Mat::reserve(size_t nelems)
         return;
     
     int r = size.p[0];
+    
+    if( (size_t)r >= nelems )
+        return;
+    
     size.p[0] = std::max((int)nelems, 1);
     size_t newsize = total()*elemSize();
     
@@ -534,6 +538,8 @@ void Mat::reserve(size_t nelems)
 void Mat::resize(size_t nelems)
 {
     int saveRows = size.p[0];
+    if( saveRows == (int)nelems )
+        return;
     CV_Assert( (int)nelems >= 0 );
     
     if( isSubmatrix() || data + step.p[0]*nelems > datalimit )
@@ -725,12 +731,17 @@ Mat Mat::reshape(int new_cn, int new_rows) const
 
     hdr.cols = new_width;
     hdr.flags = (hdr.flags & ~CV_MAT_CN_MASK) | ((new_cn-1) << CV_CN_SHIFT);
+    hdr.step[1] = CV_ELEM_SIZE(hdr.flags);
     return hdr;
 }
 
     
-void
+/*************************************************************************************************\
-setIdentity( Mat& m, const Scalar& s )
+                                        Matrix Operations
+\*************************************************************************************************/
+
+//////////////////////////////////////// set identity ////////////////////////////////////////////
+void setIdentity( Mat& m, const Scalar& s )
 {
     CV_Assert( m.dims <= 2 );
     int i, j, rows = m.rows, cols = m.cols, type = m.type();
@@ -768,6 +779,8 @@ setIdentity( Mat& m, const Scalar& s )
     }
 }
 
+//////////////////////////////////////////// trace ///////////////////////////////////////////    
+    
 Scalar trace( const Mat& m )
 {
     CV_Assert( m.dims <= 2 );
@@ -797,9 +810,7 @@ Scalar trace( const Mat& m )
     return cv::sum(m.diag());
 }
 
-/****************************************************************************************\
+////////////////////////////////////// transpose /////////////////////////////////////////
-*                                       transpose                                        *
-\****************************************************************************************/
     
 template<typename T> static void
 transposeI_( Mat& mat )
@@ -968,9 +979,7 @@ Mat Mat::cross(const Mat& m) const
 }
 
 
-/****************************************************************************************\
+////////////////////////////////////////// reduce ////////////////////////////////////////////
-*                                Reduce Mat to vector                                 *
-\****************************************************************************************/
 
 template<typename T, typename ST, class Op> static void
 reduceR_( const Mat& srcmat, Mat& dstmat )
@@ -1179,6 +1188,8 @@ void reduce(const Mat& src, Mat& dst, int dim, int op, int dtype)
 }
 
     
+//////////////////////////////////////// sort ///////////////////////////////////////////
+
 template<typename T> static void sort_( const Mat& src, Mat& dst, int flags )
 {
     AutoBuffer<T> buf;
@@ -1307,6 +1318,10 @@ void sortIdx( const Mat& src, Mat& dst, int flags )
     func( src, dst, flags );
 }
 
+    
+    
+////////////////////////////////////////// kmeans ////////////////////////////////////////////
+    
 static void generateRandomCenter(const vector<Vec2f>& box, float* center, RNG& rng)
 {
     size_t j, dims = box.size();
@@ -2850,7 +2865,6 @@ void normalize( const SparseMat& src, SparseMat& dst, double a, int norm_type )
     src.convertTo( dst, -1, scale );
 }
     
-    
 }
  
 /* End of file. */