fixed some GCC 4.4 warnings

2010-11-20 12:05:28 +00:00
parent 752c4bc48b
commit de4f1aeb06
7 changed files with 17 additions and 20 deletions
--- a/modules/imgproc/src/featureselect.cpp
+++ b/modules/imgproc/src/featureselect.cpp
@@ -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 )