From 89f64681d03e60671c26a77403a4141f0ee070aa Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Wed, 20 Oct 2010 12:34:59 +0000 Subject: [PATCH] fixed several warnings; modified size comparison: m1.size() == m2.size() => m1.size == m2.size --- modules/imgproc/src/thresh.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/imgproc/src/thresh.cpp b/modules/imgproc/src/thresh.cpp index e8ad79ad96..8eefdf43fc 100644 --- a/modules/imgproc/src/thresh.cpp +++ b/modules/imgproc/src/thresh.cpp @@ -589,7 +589,7 @@ cvThreshold( const void* srcarr, void* dstarr, double thresh, double maxval, int { cv::Mat src = cv::cvarrToMat(srcarr), dst = cv::cvarrToMat(dstarr), dst0 = dst; - CV_Assert( src.size() == dst.size() && src.channels() == dst.channels() && + CV_Assert( src.size == dst.size && src.channels() == dst.channels() && (src.depth() == dst.depth() || dst.depth() == CV_8U)); thresh = cv::threshold( src, dst, thresh, maxval, type ); @@ -604,7 +604,7 @@ cvAdaptiveThreshold( const void *srcIm, void *dstIm, double maxValue, int method, int type, int blockSize, double delta ) { cv::Mat src = cv::cvarrToMat(srcIm), dst = cv::cvarrToMat(dstIm); - CV_Assert( src.size() == dst.size() && src.type() == dst.type() ); + CV_Assert( src.size == dst.size && src.type() == dst.type() ); cv::adaptiveThreshold( src, dst, maxValue, method, type, blockSize, delta ); }