mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-26 07:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7398 from vpisarev:mat2umat_copy_fix

Browse Source
This commit is contained in:
Vadim Pisarevsky 2016-10-05 12:21:41 +00:00
commit 913b9cd661
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,6 +263,11 @@ void Mat::copyTo( OutputArray _dst ) const
if( _dst.isUMat() ) if( _dst.isUMat() )
{ {
if( empty() )
{
_dst.release();
return;
}
_dst.create( dims, size.p, type() ); _dst.create( dims, size.p, type() );
UMat dst = _dst.getUMat(); UMat dst = _dst.getUMat();

2
modules/videoio/src/cap_avfoundation_mac.mm
View File

@ -118,7 +118,6 @@ private:
int height; int height;
int settingWidth; int settingWidth;
int settingHeight; int settingHeight;
OSType mInputPixelFormat;
int started; int started;
}; };
@ -163,7 +162,6 @@ private:
CMTime mFrameTimestamp; CMTime mFrameTimestamp;
size_t mFrameNum; size_t mFrameNum;
OSType mInputPixelFormat;
int started; int started;
}; };