generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hopefully, fixed crash in sparse mat test

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-05-15 16:15:10 +03:00
parent 66eb270cf7
commit 4a9b244577
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/matrix.cpp
View File

@ -4816,7 +4816,8 @@ void SparseMat::copyTo( SparseMat& m ) const
void SparseMat::copyTo( Mat& m ) const void SparseMat::copyTo( Mat& m ) const
{ {
CV_Assert( hdr ); CV_Assert( hdr );
m.create( dims(), hdr->size, type() ); int ndims = dims();
m.create( ndims, hdr->size, type() );
m = Scalar(0); m = Scalar(0);
SparseMatConstIterator from = begin(); SparseMatConstIterator from = begin();
@ -4825,7 +4826,7 @@ void SparseMat::copyTo( Mat& m ) const
for( i = 0; i < N; i++, ++from ) for( i = 0; i < N; i++, ++from )
{ {
const Node* n = from.node(); const Node* n = from.node();
copyElem( from.ptr, m.ptr(n->idx), esz); copyElem( from.ptr, (ndims > 1 ? m.ptr(n->idx) : m.ptr(n->idx[0])), esz);
} }
} }