fixed possible crash in goodFeaturesToTrack (ticket #171). Thanks to bwieloch for...

git-svn-id: https://code.ros.org/svn/opencv/trunk@2814 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/src/cv/cvfeatureselect.cpp b/opencv/src/cv/cvfeatureselect.cpp
index e1da99259e134fb216441a4672a7feb25fe33744..90d540c7bd3d3ec6d8fad0064ff70d35f3b06993 100644 (file)
--- a/opencv/src/cv/cvfeatureselect.cpp
+++ b/opencv/src/cv/cvfeatureselect.cpp
@@ -101,10 +101,10 @@ void goodFeaturesToTrack( const Mat& image, vector<Point2f>& corners,
         int h = image.rows;
 
         const int cell_size = cvRound(minDistance);
-        const int grid_width = cvRound(w / cell_size); // round up
-        const int grid_height = cvRound(h / cell_size); // round up
+        const int grid_width = (w + cell_size - 1) / cell_size;
+        const int grid_height = (h + cell_size - 1) / cell_size;
 
-        std::vector <  std::vector <Point2f> > grid(grid_width*grid_height);
+        std::vector<std::vector<Point2f> > grid(grid_width*grid_height);
 
         minDistance *= minDistance;