From 4a9b24457779352581c7878ed2734b31f103e00a Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 15 May 2015 16:15:10 +0300 Subject: [PATCH] hopefully, fixed crash in sparse mat test --- modules/core/src/matrix.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index 42b271f1eb..b273c8a7d8 100644 --- a/modules/core/src/matrix.cpp +++ b/modules/core/src/matrix.cpp @@ -4816,7 +4816,8 @@ void SparseMat::copyTo( SparseMat& m ) const void SparseMat::copyTo( Mat& m ) const { CV_Assert( hdr ); - m.create( dims(), hdr->size, type() ); + int ndims = dims(); + m.create( ndims, hdr->size, type() ); m = Scalar(0); SparseMatConstIterator from = begin(); @@ -4825,7 +4826,7 @@ void SparseMat::copyTo( Mat& m ) const for( i = 0; i < N; i++, ++from ) { 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); } }