made calcBackproject slightly more robust.
authorVadim Pisarevsky <no@email>
Sun, 7 Nov 2010 13:58:15 +0000 (13:58 +0000)
committerVadim Pisarevsky <no@email>
Sun, 7 Nov 2010 13:58:15 +0000 (13:58 +0000)
modules/imgproc/src/histogram.cpp

index 975af78..3da9d7c 100644 (file)
@@ -903,7 +903,7 @@ calcBackProj_( vector<uchar*>& _ptrs, const vector<int>& _deltas,
                     for( i = 0; i < dims; i++ )
                     {
                         int idx = cvFloor(*ptrs[i]*uniranges[i*2] + uniranges[i*2+1]);
-                        if( (unsigned)idx >= (unsigned)size[i] )
+                        if( (unsigned)idx >= (unsigned)size[i] || (_ranges && *ptrs[i] >= _ranges[i][1]))
                             break;
                         ptrs[i] += deltas[i*2];
                         Hptr += idx*hstep[i];