generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-10-20 12:34:59 +00:00
parent f7bebe8270
commit 89f64681d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/src/thresh.cpp
View File

@@ -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::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)); (src.depth() == dst.depth() || dst.depth() == CV_8U));
thresh = cv::threshold( src, dst, thresh, maxval, type ); 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 ) int method, int type, int blockSize, double delta )
{ {
cv::Mat src = cv::cvarrToMat(srcIm), dst = cv::cvarrToMat(dstIm); 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 ); cv::adaptiveThreshold( src, dst, maxValue, method, type, blockSize, delta );
} }