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

whitespaces

Browse Source
This commit is contained in:
Adrien BAK 2014-10-14 16:31:22 +09:00
parent ee210afc44
commit 5c98209127
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/photo/src/seamless_cloning_impl.cpp
View File

@ -108,7 +108,7 @@ void Cloning::dst(const Mat& src, Mat& dest, bool invert)
Mat temp = Mat::zeros(src.rows, 2 * src.cols + 2, CV_32F); Mat temp = Mat::zeros(src.rows, 2 * src.cols + 2, CV_32F);
int flag = invert ? DFT_ROWS + DFT_SCALE + DFT_INVERSE: DFT_ROWS; int flag = invert ? DFT_ROWS + DFT_SCALE + DFT_INVERSE: DFT_ROWS;
src.copyTo(temp(Rect(1,0, src.cols, src.rows))); src.copyTo(temp(Rect(1,0, src.cols, src.rows)));
for(int j = 0 ; j < src.rows ; ++j) for(int j = 0 ; j < src.rows ; ++j)
@ -127,7 +127,6 @@ void Cloning::dst(const Mat& src, Mat& dest, bool invert)
merge(planes, 2, complex); merge(planes, 2, complex);
dft(complex, complex, flag); dft(complex, complex, flag);
split(complex, planes); split(complex, planes);
temp = Mat::zeros(src.cols, 2 * src.rows + 2, CV_32F); temp = Mat::zeros(src.cols, 2 * src.rows + 2, CV_32F);
for(int j = 0 ; j < src.cols ; ++j) for(int j = 0 ; j < src.cols ; ++j)
@ -140,7 +139,7 @@ void Cloning::dst(const Mat& src, Mat& dest, bool invert)
tempLinePtr[temp.cols - 1 - i] = - val; tempLinePtr[temp.cols - 1 - i] = - val;
} }
} }
Mat planes2[] = {temp, Mat::zeros(temp.size(), CV_32F)}; Mat planes2[] = {temp, Mat::zeros(temp.size(), CV_32F)};
merge(planes2, 2, complex); merge(planes2, 2, complex);
@ -164,7 +163,7 @@ void Cloning::solve(const Mat &img, Mat& mod_diff, Mat &result)
Mat res; Mat res;
dst(mod_diff, res); dst(mod_diff, res);
for(int j = 0 ; j < h-2; j++) for(int j = 0 ; j < h-2; j++)
{ {
float * resLinePtr = res.ptr<float>(j); float * resLinePtr = res.ptr<float>(j);
@ -192,7 +191,7 @@ void Cloning::solve(const Mat &img, Mat& mod_diff, Mat &result)
//first row //first row
resLinePtr[0] = imgLinePtr[0]; resLinePtr[0] = imgLinePtr[0];
for(int i = 1 ; i < w-1 ; ++i) for(int i = 1 ; i < w-1 ; ++i)
{ {
//saturate cast is not used here, because it behaves differently from the previous implementation //saturate cast is not used here, because it behaves differently from the previous implementation
@ -292,13 +291,13 @@ void Cloning::arrayProduct(const cv::Mat& lhs, const cv::Mat& rhs, cv::Mat& resu
{ {
vector <Mat> lhs_channels; vector <Mat> lhs_channels;
vector <Mat> result_channels; vector <Mat> result_channels;
split(lhs,lhs_channels); split(lhs,lhs_channels);
split(result,result_channels); split(result,result_channels);
for(int chan = 0 ; chan < 3 ; ++chan) for(int chan = 0 ; chan < 3 ; ++chan)
multiply(lhs_channels[chan],rhs,result_channels[chan]); multiply(lhs_channels[chan],rhs,result_channels[chan]);
merge(result_channels,result); merge(result_channels,result);
} }