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

fixed typo

Browse Source
This commit is contained in:
marina.kolpakova
2012-11-07 02:27:07 +04:00
parent 5fb9f48360
commit 4656872161
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,8 +561,8 @@ public:
private: private:
void detectNoRoi(const Mat& image, std::vector<Detection>& objects) const; void detectNoRoi(const Mat& image, std::vector<Detection>& objects) const;
struct Filds; struct Fields;
Filds* filds; Fields* fields;
float minScale; float minScale;
float maxScale; float maxScale;

16
modules/objdetect/src/softcascade.cpp
View File

@@ -253,7 +253,7 @@ struct ChannelStorage
} }
struct cv::SCascade::Filds struct cv::SCascade::Fields
{ {
float minScale; float minScale;
float maxScale; float maxScale;
@@ -493,9 +493,9 @@ struct cv::SCascade::Filds
}; };
cv::SCascade::SCascade(const float mins, const float maxs, const int nsc, const int rej) cv::SCascade::SCascade(const float mins, const float maxs, const int nsc, const int rej)
: filds(0), minScale(mins), maxScale(maxs), scales(nsc), rejfactor(rej) {} : fields(0), minScale(mins), maxScale(maxs), scales(nsc), rejfactor(rej) {}
cv::SCascade::~SCascade() { delete filds;} cv::SCascade::~SCascade() { delete fields;}
void cv::SCascade::read(const FileNode& fn) void cv::SCascade::read(const FileNode& fn)
{ {
@@ -504,15 +504,15 @@ void cv::SCascade::read(const FileNode& fn)
bool cv::SCascade::load(const FileNode& fn) bool cv::SCascade::load(const FileNode& fn)
{ {
if (filds) delete filds; if (fields) delete fields;
filds = new Filds; fields = new Fields;
return filds->fill(fn, minScale, maxScale); return fields->fill(fn, minScale, maxScale);
} }
void cv::SCascade::detectNoRoi(const cv::Mat& image, std::vector<Detection>& objects) const void cv::SCascade::detectNoRoi(const cv::Mat& image, std::vector<Detection>& objects) const
{ {
Filds& fld = *filds; Fields& fld = *fields;
// create integrals // create integrals
ChannelStorage storage(image, fld.shrinkage); ChannelStorage storage(image, fld.shrinkage);
@@ -538,7 +538,7 @@ void cv::SCascade::detect(cv::InputArray _image, cv::InputArray _rois, std::vect
cv::Mat image = _image.getMat(); cv::Mat image = _image.getMat();
CV_Assert(image.type() == CV_8UC3); CV_Assert(image.type() == CV_8UC3);
Filds& fld = *filds; Fields& fld = *fields;
fld.calcLevels(image.size(), scales); fld.calcLevels(image.size(), scales);
objects.clear(); objects.clear();