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

Merge pull request #372 from cuda-geek:gpu-cascade-fixes

Browse Source
This commit is contained in:
cuda-geek
2013-01-31 20:13:30 +04:00
committed by OpenCV Buildbot
parent 6b4304efda cb329400df
commit d874d93e24
7 changed files with 182 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/include/opencv2/gpu/gpu.hpp
View File

@@ -1556,7 +1556,7 @@ protected:
ChannelsProcessor();
};
// Implementation of soft (stageless) cascaded detector.
// Implementation of soft (stage-less) cascaded detector.
class CV_EXPORTS SCascade : public Algorithm
{
public:
@@ -1577,8 +1577,8 @@ public:
enum { NO_REJECT = 1, DOLLAR = 2, /*PASCAL = 4,*/ DEFAULT = NO_REJECT, NMS_MASK = 0xF};
// An empty cascade will be created.
// Param minScale is a minimum scale relative to the original size of the image on which cascade will be applyed.
// Param minScale is a maximum scale relative to the original size of the image on which cascade will be applyed.
// Param minScale is a minimum scale relative to the original size of the image on which cascade will be applied.
// Param minScale is a maximum scale relative to the original size of the image on which cascade will be applied.
// Param scales is a number of scales from minScale to maxScale.
// Param flags is an extra tuning flags.
SCascade(const double minScale = 0.4, const double maxScale = 5., const int scales = 55,
@@ -1595,7 +1595,7 @@ public:
// Load cascade config.
virtual void read(const FileNode& fn);
// Return the matrix of of detectioned objects.
// Return the matrix of of detected objects.
// Param image is a frame on which detector will be applied.
// Param rois is a regions of interests mask generated by genRoi.
// Only the objects that fall into one of the regions will be returned.