Merge pull request #482 from vpisarev:c2cpp_imgproc_part2

2013-02-14 20:13:45 +04:00
parent 956aa68fb5 3c25ddd9ff
commit 4cc3dfe27c
18 changed files with 1354 additions and 2529 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -1969,6 +1969,11 @@ static TransposeInplaceFunc transposeInplaceTab[] =
 void cv::transpose( InputArray _src, OutputArray _dst )
 {
    Mat src = _src.getMat();
+    if( src.empty() )
+    {
+        _dst.release();
+        return;
+    }
    size_t esz = src.elemSize();
    CV_Assert( src.dims <= 2 && esz <= (size_t)32 );