potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

fixed some GCC 4.4 warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-11-20 12:05:28 +00:00
parent 752c4bc48b
commit de4f1aeb06
7 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/featureselect.cpp
+1 -2
View File
@@ -57,8 +57,7 @@ void goodFeaturesToTrack( const Mat& image, vector<Point2f>& corners,
{
CV_Assert( qualityLevel > 0 && minDistance >= 0 && maxCorners >= 0 );
if( mask.data )
CV_Assert( mask.type() == CV_8UC1 && mask.size() == image.size() );
CV_Assert( mask.empty() || (mask.type() == CV_8UC1 && mask.size() == image.size()) );
Mat eig, tmp;
if( useHarrisDetector )
modules/imgproc/src/histogram.cpp
+1 -2
View File
@@ -117,8 +117,7 @@ static void histPrepareImages( const Mat* images, int nimages, const int* channe
Size& imsize, vector<double>& uniranges )
{
int i, j, c;
if(!channels)
CV_Assert( nimages == dims );
CV_Assert( channels != 0 || nimages == dims );
imsize = images[0].size();
int depth = images[0].depth(), esz1 = (int)images[0].elemSize1();