Merge pull request #4063 from Dikay900:2_4_to_master

This commit is contained in:
Vadim Pisarevsky
2015-05-28 14:49:13 +00:00
7 changed files with 267 additions and 18 deletions

View File

@@ -46,6 +46,7 @@
#include <cstdio>
#include <iterator>
#include <limits>
/****************************************************************************************\
The code below is implementation of HOG (Histogram-of-Oriented Gradients)
@@ -3533,7 +3534,7 @@ void HOGDescriptor::groupRectangles(std::vector<cv::Rect>& rectList, std::vector
std::vector<cv::Rect_<double> > rrects(nclasses);
std::vector<int> numInClass(nclasses, 0);
std::vector<double> foundWeights(nclasses, DBL_MIN);
std::vector<double> foundWeights(nclasses, -std::numeric_limits<double>::max());
int i, j, nlabels = (int)labels.size();
for( i = 0; i < nlabels; i++ )