Merge pull request #7398 from vpisarev:mat2umat_copy_fix

913b9cd6 · Vadim Pisarevsky · 42fbfb9b · 83f2eb79 · 913b9cd6 · 913b9cd6
Commit 913b9cd6 authored Oct 05, 2016 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

copy.cpp modules/core/src/copy.cpp +5 -0

cap_avfoundation_mac.mm modules/videoio/src/cap_avfoundation_mac.mm +0 -2

No files found.
--- a/modules/core/src/copy.cpp
+++ b/modules/core/src/copy.cpp
@@ -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();

--- a/modules/videoio/src/cap_avfoundation_mac.mm
+++ b/modules/videoio/src/cap_avfoundation_mac.mm
@@ -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;
 };