Commit 0972a2d7 authored by siddharth's avatar siddharth

Fixed mixed cloning bug

parent 88d05a89
...@@ -455,6 +455,8 @@ void Cloning::normal_clone(Mat &I, Mat &mask, Mat &wmask, Mat &cloned, int num) ...@@ -455,6 +455,8 @@ void Cloning::normal_clone(Mat &I, Mat &mask, Mat &wmask, Mat &cloned, int num)
{ {
int w = I.size().width; int w = I.size().width;
int h = I.size().height; int h = I.size().height;
int channel = I.channels();
initialization(I,mask,wmask); initialization(I,mask,wmask);
...@@ -466,20 +468,33 @@ void Cloning::normal_clone(Mat &I, Mat &mask, Mat &wmask, Mat &cloned, int num) ...@@ -466,20 +468,33 @@ void Cloning::normal_clone(Mat &I, Mat &mask, Mat &wmask, Mat &cloned, int num)
} }
else if(num == 2) else if(num == 2)
{ {
for(int i=0;i < h; i++) for(int i=0;i < h; i++)
for(int j=0; j < w; j++) {
for(int j=0; j < w; j++)
{ {
if(abs(sgx.at<float>(i,j) - sgy.at<float>(i,j)) > abs(grx.at<float>(i,j) - gry.at<float>(i,j))) for(int c=0;c<channel;++c)
{ {
srx32.at<float>(i,j) = sgx.at<float>(i,j) * smask.at<float>(i,j); if(abs(sgx.at<float>(i,j*channel+c) - sgy.at<float>(i,j*channel+c)) >
sry32.at<float>(i,j) = sgy.at<float>(i,j) * smask.at<float>(i,j); abs(grx.at<float>(i,j*channel+c) - gry.at<float>(i,j*channel+c)))
} {
else
{ srx32.at<float>(i,j*channel+c) = sgx.at<float>(i,j*channel+c)
srx32.at<float>(i,j) = grx.at<float>(i,j) * smask.at<float>(i,j); * smask.at<float>(i,j);
sry32.at<float>(i,j) = gry.at<float>(i,j) * smask.at<float>(i,j); sry32.at<float>(i,j*channel+c) = sgy.at<float>(i,j*channel+c)
* smask.at<float>(i,j);
}
else
{
srx32.at<float>(i,j*channel+c) = grx.at<float>(i,j*channel+c)
* smask.at<float>(i,j);
sry32.at<float>(i,j*channel+c) = gry.at<float>(i,j*channel+c)
* smask.at<float>(i,j);
}
} }
} }
}
} }
else if(num == 3) else if(num == 3)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment