Commit 83f2eb79 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

make sure that the empty mat is copied to UMat properly - i.e. UMat becomes…

make sure that the empty mat is copied to UMat properly - i.e. UMat becomes empty. Before the patch such copy operation crashed
parent e0435d3b
......@@ -263,6 +263,11 @@ void Mat::copyTo( OutputArray _dst ) const
if( _dst.isUMat() )
{
if( empty() )
{
_dst.release();
return;
}
_dst.create( dims, size.p, type() );
UMat dst = _dst.getUMat();
......
......@@ -118,7 +118,6 @@ private:
int height;
int settingWidth;
int settingHeight;
OSType mInputPixelFormat;
int started;
};
......@@ -163,7 +162,6 @@ private:
CMTime mFrameTimestamp;
size_t mFrameNum;
OSType mInputPixelFormat;
int started;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment