Merge pull request opencv#483 from cbalint13:slic_lsc

ramartya · Dec 22, 2015 · df56f27 · df56f27
2 parents e8937cc + e5612c3
commit df56f27
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/modules/ximgproc/src/lsc.cpp b/modules/ximgproc/src/lsc.cpp
@@ -274,10 +274,10 @@ void SuperpixelLSCImpl::getLabelContourMask(OutputArray _mask, bool _thick_line)
 
     if ( !_thick_line ) line_width = 1;
 
-    _mask.create( m_height, m_width, CV_8SC1 );
+    _mask.create( m_height, m_width, CV_8UC1 );
     Mat mask = _mask.getMat();
 
-    mask.setTo(1);
+    mask.setTo(0);
 
     const int dx8[8] = { -1, -1,  0,  1, 1, 1, 0, -1 };
     const int dy8[8] = {  0, -1, -1, -1, 0, 1, 1,  1 };
@@ -309,7 +309,7 @@ void SuperpixelLSCImpl::getLabelContourMask(OutputArray _mask, bool _thick_line)
         }
         if( np > line_width )
         {
-           mask.at<char>(j,k) = -1;
+           mask.at<char>(j,k) = (uchar)255;
            istaken[mainindex] = true;
         }
         mainindex++;

diff --git a/modules/ximgproc/src/seeds.cpp b/modules/ximgproc/src/seeds.cpp
@@ -1214,7 +1214,7 @@ void SuperpixelSEEDSImpl::getLabelContourMask(OutputArray image, bool thick_line
                 }
             }
             if( neighbors > 1 )
-                *dst.ptr<uchar>(j, k) = (uchar)-1;
+                *dst.ptr<uchar>(j, k) = (uchar)255;
         }
     }
 }

diff --git a/modules/ximgproc/src/slic.cpp b/modules/ximgproc/src/slic.cpp
@@ -258,10 +258,10 @@ void SuperpixelSLICImpl::getLabelContourMask(OutputArray _mask, bool _thick_line
 
     if ( !_thick_line ) line_width = 1;
 
-    _mask.create( m_height, m_width, CV_8SC1 );
+    _mask.create( m_height, m_width, CV_8UC1 );
     Mat mask = _mask.getMat();
 
-    mask.setTo(1);
+    mask.setTo(0);
 
     const int dx8[8] = { -1, -1,  0,  1, 1, 1, 0, -1 };
     const int dy8[8] = {  0, -1, -1, -1, 0, 1, 1,  1 };
@@ -293,7 +293,7 @@ void SuperpixelSLICImpl::getLabelContourMask(OutputArray _mask, bool _thick_line
         }
         if( np > line_width )
         {
-           mask.at<char>(j,k) = -1;
+           mask.at<char>(j,k) = (uchar)255;
            istaken[mainindex] = true;
         }
         mainindex++;
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
                 if( neighbors > 1 )
-                    *dst.ptr<uchar>(j, k) = (uchar)-1;
+                    *dst.ptr<uchar>(j, k) = (uchar)255;
             }
         }
     }
@@ Expand Down @@