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

remove Mat copying

Browse Source
This commit is contained in:
marina.kolpakova 2012-10-05 15:59:51 +04:00
parent 0ff8a4633d
commit 9771c3c7ec
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,7 +283,7 @@ struct ChannelStorage
// convert to luv // convert to luv
cv::Mat luv; cv::Mat luv;
cv::cvtColor(colored, luv, CV_RGB2Luv); cv::cvtColor(colored, luv, CV_BGR2Luv);
// split to 3 one channel matrix // split to 3 one channel matrix
std::vector<cv::Mat> splited, luvs; std::vector<cv::Mat> splited, luvs;
@ -300,7 +300,7 @@ struct ChannelStorage
// convert to grey // convert to grey
cv::Mat grey; cv::Mat grey;
cv::cvtColor(colored, grey, CV_RGB2GRAY); cv::cvtColor(colored, grey, CV_BGR2GRAY);
// get derivative // get derivative
cv::Mat df_dx, df_dy, mag, angle; cv::Mat df_dx, df_dy, mag, angle;
@ -371,7 +371,7 @@ struct ChannelStorage
float get(const int x, const int y, const int channel, const cv::Rect& area) const float get(const int x, const int y, const int channel, const cv::Rect& area) const
{ {
CV_Assert(channel < HOG_LUV_BINS); CV_Assert(channel < HOG_LUV_BINS);
const cv::Mat m = hog[channel]; const cv::Mat& m = hog[channel];
dprintf("feature box %d %d %d %d ", area.x, area.y, area.width, area.height); dprintf("feature box %d %d %d %d ", area.x, area.y, area.width, area.height);
dprintf("get for channel %d\n", channel); dprintf("get for channel %d\n", channel);
@ -731,9 +731,6 @@ void cv::SoftCascade::detectMultiScale(const Mat& image, const std::vector<cv::R
const Filds& fld = *filds; const Filds& fld = *filds;
cv::Mat image1;
cv::cvtColor(image, image1, CV_BGR2RGB);
// create integrals // create integrals
ChannelStorage storage(image, fld.shrinkage); ChannelStorage storage(image, fld.shrinkage);