Skip to content

O
opencv
Commit e9b8571a authored by arnaudbrejeon's avatar arnaudbrejeon
Browse files
Options

Fix bug

parent 3efd2df8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/photo/src/inpaint.cpp
View file @ e9b8571a
...@@ -299,7 +299,7 @@ icvTeleaInpaintFMM(const CvMat *f, CvMat *t, CvMat *out, int range, CvPriorityQu ...@@ -299,7 +299,7 @@ icvTeleaInpaintFMM(const CvMat *f, CvMat *t, CvMat *out, int range, CvPriorityQu
else if(q==1) {i=ii; j=jj-1;} else if(q==1) {i=ii; j=jj-1;}
else if(q==2) {i=ii+1; j=jj;} else if(q==2) {i=ii+1; j=jj;}
else if(q==3) {i=ii; j=jj+1;} else if(q==3) {i=ii; j=jj+1;}
if ((i<=1)||(j<=1)||(i>t->rows-1)||(j>t->cols-1)) continue; if ((i<=0)||(j<=0)||(i>t->rows-1)||(j>t->cols-1)) continue;
if (CV_MAT_ELEM(*f,uchar,i,j)==INSIDE) { if (CV_MAT_ELEM(*f,uchar,i,j)==INSIDE) {
dist = min4(FastMarching_solve(i-1,j,i,j-1,f,t), dist = min4(FastMarching_solve(i-1,j,i,j-1,f,t),
...@@ -411,7 +411,7 @@ icvTeleaInpaintFMM(const CvMat *f, CvMat *t, CvMat *out, int range, CvPriorityQu ...@@ -411,7 +411,7 @@ icvTeleaInpaintFMM(const CvMat *f, CvMat *t, CvMat *out, int range, CvPriorityQu
else if(q==1) {i=ii; j=jj-1;} else if(q==1) {i=ii; j=jj-1;}
else if(q==2) {i=ii+1; j=jj;} else if(q==2) {i=ii+1; j=jj;}
else if(q==3) {i=ii; j=jj+1;} else if(q==3) {i=ii; j=jj+1;}
if ((i<=1)||(j<=1)||(i>t->rows-1)||(j>t->cols-1)) continue; if ((i<=0)||(j<=0)||(i>t->rows-1)||(j>t->cols-1)) continue;
if (CV_MAT_ELEM(*f,uchar,i,j)==INSIDE) { if (CV_MAT_ELEM(*f,uchar,i,j)==INSIDE) {
dist = min4(FastMarching_solve(i-1,j,i,j-1,f,t), dist = min4(FastMarching_solve(i-1,j,i,j-1,f,t),
...@@ -531,7 +531,7 @@ icvNSInpaintFMM(const CvMat *f, CvMat *t, CvMat *out, int range, CvPriorityQueue ...@@ -531,7 +531,7 @@ icvNSInpaintFMM(const CvMat *f, CvMat *t, CvMat *out, int range, CvPriorityQueue
else if(q==1) {i=ii; j=jj-1;} else if(q==1) {i=ii; j=jj-1;}
else if(q==2) {i=ii+1; j=jj;} else if(q==2) {i=ii+1; j=jj;}
else if(q==3) {i=ii; j=jj+1;} else if(q==3) {i=ii; j=jj+1;}
if ((i<=1)||(j<=1)||(i>t->rows-1)||(j>t->cols-1)) continue; if ((i<=0)||(j<=0)||(i>t->rows-1)||(j>t->cols-1)) continue;
if (CV_MAT_ELEM(*f,uchar,i,j)==INSIDE) { if (CV_MAT_ELEM(*f,uchar,i,j)==INSIDE) {
dist = min4(FastMarching_solve(i-1,j,i,j-1,f,t), dist = min4(FastMarching_solve(i-1,j,i,j-1,f,t),
...@@ -619,7 +619,7 @@ icvNSInpaintFMM(const CvMat *f, CvMat *t, CvMat *out, int range, CvPriorityQueue ...@@ -619,7 +619,7 @@ icvNSInpaintFMM(const CvMat *f, CvMat *t, CvMat *out, int range, CvPriorityQueue
else if(q==1) {i=ii; j=jj-1;} else if(q==1) {i=ii; j=jj-1;}
else if(q==2) {i=ii+1; j=jj;} else if(q==2) {i=ii+1; j=jj;}
else if(q==3) {i=ii; j=jj+1;} else if(q==3) {i=ii; j=jj+1;}
if ((i<=1)||(j<=1)||(i>t->rows-1)||(j>t->cols-1)) continue; if ((i<=0)||(j<=0)||(i>t->rows-1)||(j>t->cols-1)) continue;
if (CV_MAT_ELEM(*f,uchar,i,j)==INSIDE) { if (CV_MAT_ELEM(*f,uchar,i,j)==INSIDE) {
dist = min4(FastMarching_solve(i-1,j,i,j-1,f,t), dist = min4(FastMarching_solve(i-1,j,i,j-1,f,t),
......
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