Skip to content

O
opencv
Commit 33bc0895 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

fixed HOGDescriptor::detect and HOGDescriptor::detectMultiScale signatures (ticket #1304)

parent 0b234b7a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
View file @ 33bc0895
...@@ -546,22 +546,22 @@ public: ...@@ -546,22 +546,22 @@ public:
const vector<Point>& locations=vector<Point>()) const; const vector<Point>& locations=vector<Point>()) const;
//with found weights output //with found weights output
CV_WRAP virtual void detect(const Mat& img, CV_OUT vector<Point>& foundLocations, CV_WRAP virtual void detect(const Mat& img, CV_OUT vector<Point>& foundLocations,
vector<double>& weights, CV_OUT vector<double>& weights,
double hitThreshold=0, Size winStride=Size(), double hitThreshold=0, Size winStride=Size(),
Size padding=Size(), Size padding=Size(),
const vector<Point>& searchLocations=vector<Point>()) const; const vector<Point>& searchLocations=vector<Point>()) const;
//without found weights output //without found weights output
CV_WRAP virtual void detect(const Mat& img, CV_OUT vector<Point>& foundLocations, virtual void detect(const Mat& img, CV_OUT vector<Point>& foundLocations,
double hitThreshold=0, Size winStride=Size(), double hitThreshold=0, Size winStride=Size(),
Size padding=Size(), Size padding=Size(),
const vector<Point>& searchLocations=vector<Point>()) const; const vector<Point>& searchLocations=vector<Point>()) const;
//with result weights output //with result weights output
CV_WRAP virtual void detectMultiScale(const Mat& img, CV_OUT vector<Rect>& foundLocations, CV_WRAP virtual void detectMultiScale(const Mat& img, CV_OUT vector<Rect>& foundLocations,
vector<double>& foundWeights, double hitThreshold=0, CV_OUT vector<double>& foundWeights, double hitThreshold=0,
Size winStride=Size(), Size padding=Size(), double scale=1.05, Size winStride=Size(), Size padding=Size(), double scale=1.05,
double finalThreshold=2.0,bool useMeanshiftGrouping = false) const; double finalThreshold=2.0,bool useMeanshiftGrouping = false) const;
//without found weights output //without found weights output
CV_WRAP virtual void detectMultiScale(const Mat& img, CV_OUT vector<Rect>& foundLocations, virtual void detectMultiScale(const Mat& img, CV_OUT vector<Rect>& foundLocations,
double hitThreshold=0, Size winStride=Size(), double hitThreshold=0, Size winStride=Size(),
Size padding=Size(), double scale=1.05, Size padding=Size(), double scale=1.05,
double finalThreshold=2.0, bool useMeanshiftGrouping = false) const; double finalThreshold=2.0, bool useMeanshiftGrouping = false) const;
......
samples/python2/peopledetect.py
View file @ 33bc0895
...@@ -38,7 +38,7 @@ if __name__ == '__main__': ...@@ -38,7 +38,7 @@ if __name__ == '__main__':
print 'loading error' print 'loading error'
continue continue
found = hog.detectMultiScale(img, winStride=(8,8), padding=(32,32), scale=1.05) found, w = hog.detectMultiScale(img, winStride=(8,8), padding=(32,32), scale=1.05)
found_filtered = [] found_filtered = []
for ri, r in enumerate(found): for ri, r in enumerate(found):
for qi, q in enumerate(found): for qi, q in enumerate(found):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment