Merge pull request #1076 from jexner:lsc-enforce-connectivity-fix

8 years ago · 0ed62f35f2
parent 3ab2b4139a 5dc7be6a06
commit 0ed62f35f2
1 changed files with 17 additions and 2 deletions
--- a/modules/ximgproc/src/lsc.cpp
+++ b/modules/ximgproc/src/lsc.cpp
@ -796,8 +796,23 @@ inline void SuperpixelLSCImpl::PostEnforceLabelConnectivity( int threshold )
        Size[Label2] = Size[Label1] + Size[Label2];
        if( Size[Label2] >= threshold )
        {
-          Sarray.erase( S );
-          Sarray.erase( Stmp );
+          if( S == Stmp )
+          {
+            // erasing only one should be sufficient when the iterators are the same
+            // (maybe the case S == Stmp is not even possible?)
+            Sarray.erase( S );
+          }
+          else if( S < Stmp )
+          {
+            // erase the latter element first, so the other iterator is not invalidated
+            Sarray.erase( Stmp );
+            Sarray.erase( S );
+          }
+          else
+          {
+            Sarray.erase( S );
+            Sarray.erase( Stmp );
+          }
        }
        else
        {