Conflicts:
modules/objdetect/src/hog.cpp
fix android build
#include <cstdio>
#include <iterator>
+#include <limits>
/****************************************************************************************\
The code below is implementation of HOG (Histogram-of-Oriented Gradients)
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++ )