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

Merge pull request #545 from cuda-geek:fix_lying_assertation

Browse Source
This commit is contained in:
cuda-geek 2013-02-25 23:11:02 +04:00 committed by OpenCV Buildbot
commit 37568b26ed
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,7 @@ public:
virtual ~ChannelFeatureBuilder(); virtual ~ChannelFeatureBuilder();
// apply channels to source frame // apply channels to source frame
CV_WRAP_AS(compute) virtual void operator()(InputArray src, CV_OUT OutputArray channels) const = 0; 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 static cv::Ptr<ChannelFeatureBuilder> create();
}; };

17
modules/softcascade/src/integral_channel_builder.cpp
View File

@ -51,14 +51,20 @@ class ICFBuilder : public ChannelFeatureBuilder
virtual ~ICFBuilder() {} virtual ~ICFBuilder() {}
virtual cv::AlgorithmInfo* info() const; virtual cv::AlgorithmInfo* info() const;
virtual void operator()(cv::InputArray _frame, CV_OUT cv::OutputArray _integrals) const virtual void operator()(cv::InputArray _frame, CV_OUT cv::OutputArray _integrals, cv::Size channelsSize) const
{ {
CV_Assert(_frame.type() == CV_8UC3); CV_Assert(_frame.type() == CV_8UC3);
cv::Mat frame = _frame.getMat(); cv::Mat frame = _frame.getMat();
int h = frame.rows; int h = frame.rows;
int w = frame.cols; int w = frame.cols;
_integrals.create(h / 4 * 10 + 1, w / 4 + 1, CV_32SC1);
if (channelsSize != cv::Size())
_integrals.create(channelsSize.height * 10 + 1, channelsSize.width + 1, CV_32SC1);
if(_integrals.empty())
_integrals.create(frame.rows * 10 + 1, frame.cols + 1, CV_32SC1);
cv::Mat& integrals = _integrals.getMatRef(); cv::Mat& integrals = _integrals.getMatRef();
cv::Mat channels, gray; cv::Mat channels, gray;
@ -98,12 +104,7 @@ class ICFBuilder : public ChannelFeatureBuilder
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
splited.push_back(channels(cv::Rect(0, h * (7 + i), w, h))); splited.push_back(channels(cv::Rect(0, h * (7 + i), w, h)));
split(luv, splited); split(luv, splited);
cv::resize(channels, shrunk, cv::Size(integrals.cols - 1, integrals.rows - 1), -1 , -1, CV_INTER_AREA);
float shrinkage = static_cast<float>(integrals.cols - 1) / channels.cols;
CV_Assert(shrinkage == 0.25);
cv::resize(channels, shrunk, cv::Size(), shrinkage, shrinkage, CV_INTER_AREA);
cv::integral(shrunk, integrals, cv::noArray(), CV_32S); cv::integral(shrunk, integrals, cv::noArray(), CV_32S);
} }
}; };

5
modules/softcascade/src/softcascade.cpp
View File

@ -189,11 +189,12 @@ struct ChannelStorage
ChannelStorage(const cv::Mat& colored, int shr) : shrinkage(shr) ChannelStorage(const cv::Mat& colored, int shr) : shrinkage(shr)
{ {
model_height = cvRound(colored.rows / (float)shrinkage);
builder = ChannelFeatureBuilder::create(); builder = ChannelFeatureBuilder::create();
(*builder)(colored, hog); (*builder)(colored, hog, cv::Size(cvRound(colored.cols / (float)shrinkage), model_height));
step = hog.step1(); step = hog.step1();
model_height = colored.rows / shrinkage;
} }
float get(const int channel, const cv::Rect& area) const float get(const int channel, const cv::Rect& area) const