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/histogram.cpp
+++ b/modules/imgproc/src/histogram.cpp
@@ -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();