generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some changes

Browse Source
This commit is contained in:
Konstantin Matskevich
2014-01-31 08:46:27 +04:00
parent 3ea32b87bb
commit 5c38519c65
4 changed files with 69 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/objdetect/include/opencv2/objdetect.hpp
View File

@@ -327,7 +327,7 @@ public:
Size padding = Size(),
const std::vector<Point>& searchLocations=std::vector<Point>()) const;
//ocl
virtual bool ocl_detect(const UMat& img, std::vector<Point> &hits,
virtual bool ocl_detect(InputArray img, std::vector<Point> &hits,
double hitThreshold = 0, Size winStride = Size()) const;
//with result weights output
CV_WRAP virtual void detectMultiScale(InputArray img, CV_OUT std::vector<Rect>& foundLocations,
@@ -360,7 +360,7 @@ public:
CV_PROP double L2HysThreshold;
CV_PROP bool gammaCorrection;
CV_PROP std::vector<float> svmDetector;
CV_PROP std::vector<float> oclSvmDetector;
UMat oclSvmDetector;
CV_PROP int nlevels;