Fixed mixed cloning bug

This commit is contained in:
siddharth 2014-05-29 10:17:39 +05:30
parent 88d05a89d4
commit 0972a2d758

View File

@ -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,21 +468,34 @@ 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)))
{
srx32.at<float>(i,j*channel+c) = sgx.at<float>(i,j*channel+c)
* 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 else
{ {
srx32.at<float>(i,j) = grx.at<float>(i,j) * smask.at<float>(i,j); srx32.at<float>(i,j*channel+c) = grx.at<float>(i,j*channel+c)
sry32.at<float>(i,j) = gry.at<float>(i,j) * smask.at<float>(i,j); * 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)
{ {
Mat gray = Mat(mask.size(),CV_8UC1); Mat gray = Mat(mask.size(),CV_8UC1);