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

refactor channel builder

Browse Source 
fix condition for sample index in assert
This commit is contained in:
marina.kolpakova
2013-03-01 23:39:32 +04:00
parent 1c3c11a4cc
commit 12d23aae02
6 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/softcascade/include/opencv2/softcascade/softcascade.hpp
View File

@@ -87,7 +87,7 @@ public:
virtual void write( cv::FileStorage& fs, int index) const = 0;
virtual ~FeaturePool();
static cv::Ptr<FeaturePool> create(const cv::Size& model, int nfeatures);
static cv::Ptr<FeaturePool> create(const cv::Size& model, int nfeatures, int nchannels );
};
// ========================================================================== //
@@ -128,7 +128,10 @@ public:
// apply channels to source frame
CV_WRAP_AS(compute) virtual void operator()(InputArray src, CV_OUT OutputArray channels, cv::Size channelsSize = cv::Size()) const = 0;
CV_WRAP static cv::Ptr<ChannelFeatureBuilder> create();
CV_WRAP virtual int totalChannels() const = 0;
virtual cv::AlgorithmInfo* info() const = 0;
CV_WRAP static cv::Ptr<ChannelFeatureBuilder> create(const std::string& featureType);
};
// ========================================================================== //
@@ -199,7 +202,7 @@ public:
virtual ~Octave();
static cv::Ptr<Octave> create(cv::Rect boundingBox, int npositives, int nnegatives,
int logScale, int shrinkage, int poolSize);
int logScale, int shrinkage, int poolSize, cv::Ptr<ChannelFeatureBuilder> builder);
virtual bool train(const Dataset* dataset, const FeaturePool* pool, int weaks, int treeDepth) = 0;
virtual void setRejectThresholds(OutputArray thresholds) = 0;