Merge pull request #2817 from bf:patch-1

ed1c56e0 · Roman Donchenko · OpenCV Buildbot · 150dd39b · 62533d0d · ed1c56e0
Commit ed1c56e0 authored Jun 09, 2014 by Roman Donchenko Committed by OpenCV Buildbot Jun 09, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

matmul.cpp modules/core/src/matmul.cpp +2 -1

No files found.
--- a/modules/core/src/matmul.cpp
+++ b/modules/core/src/matmul.cpp
@@ -2020,7 +2020,8 @@ void cv::perspectiveTransform( InputArray _src, OutputArray _dst, InputArray _mt
 {
    Mat src = _src.getMat(), m = _mtx.getMat();
    int depth = src.depth(), scn = src.channels(), dcn = m.rows-1;
-    CV_Assert( scn + 1 == m.cols && (depth == CV_32F || depth == CV_64F));
+    CV_Assert( scn + 1 == m.cols );
+    CV_Assert( depth == CV_32F || depth == CV_64F );

    _dst.create( src.size(), CV_MAKETYPE(depth, dcn) );
    Mat dst = _dst.getMat();