fixed several warnings; modified size comparison: m1.size() == m2.size() => m1.size == m2.size

2010-10-20 12:33:57 +00:00
parent 61ecedd33c
commit f7bebe8270
7 changed files with 37 additions and 37 deletions
--- a/modules/core/src/matmul.cpp
+++ b/modules/core/src/matmul.cpp
@@ -2878,7 +2878,7 @@ CV_IMPL void cvScaleAdd( const CvArr* srcarr1, CvScalar scale,
 {
    cv::Mat src1 = cv::cvarrToMat(srcarr1), dst = cv::cvarrToMat(dstarr);

-    CV_Assert( src1.size() == dst.size() && src1.type() == dst.type() );
+    CV_Assert( src1.size == dst.size && src1.type() == dst.type() );
    cv::scaleAdd( src1, scale.val[0], cv::cvarrToMat(srcarr2), dst );
 }