potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #11634 from vpisarev:empty_mat_with_types_2

Browse Source 
fixes handling of empty matrices in some functions (#11634)

* a part of PR #11416 by Yuki Takehara

* moved the empty mat check in Mat::copyTo()

* fixed some test failures
This commit is contained in:
Vadim Pisarevsky
2018-05-31 19:36:39 +03:00
committed by Alexander Alekhin
parent da75e463a8
commit 7d19bd6c19
9 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/copy.cpp
+6 -5
View File
@@ -246,13 +246,14 @@ void Mat::copyTo( OutputArray _dst ) const
return;
}
if( empty() )
{
_dst.release();
return;
}
if( _dst.isUMat() )
{
if( empty() )
{
_dst.release();
return;
}
_dst.create( dims, size.p, type() );
UMat dst = _dst.getUMat();
CV_Assert(dst.u != NULL);