Merge remote-tracking branch 'origin/2.4' into merge-2.4

This commit is contained in:
Roman Donchenko
2014-06-02 13:43:28 +04:00
5 changed files with 21 additions and 6 deletions

View File

@@ -1009,7 +1009,7 @@ cvFindNextContour( CvContourScanner scanner )
if( mode == CV_RETR_FLOODFILL )
{
prev = ((int*)img)[x - 1];
new_mask = INT_MIN >> 1;
new_mask = INT_MIN / 2;
}
for( ; y < height; y++, img += step )