# HG changeset patch
# User jordigh
# Date 1346875360 0
# Node ID 01e3122954062369734cd3bcc31b893cdbe0189b
# Parent  319cadd3308438b25817c01990fa14f61c411d4f
Remove zero padding from bwlabeln output

diff --git a/src/bwlabeln.cc b/src/bwlabeln.cc
--- a/src/bwlabeln.cc
+++ b/src/bwlabeln.cc
@@ -412,14 +412,17 @@
           ids_to_label[id] = label;
         }
       else
-        {
           label = try_label -> second;
-        }
 
       L_vec[*idx] = label;
     }
 
-  rval(0) = L;
+  // Remove the zero padding...
+  Array<idx_vector> inner_slice (dim_vector (size_vec.length (), 1));
+  for (octave_idx_type i = 0; i < padded_size.length (); i++)
+    inner_slice(i) = idx_vector (1, padded_size(i) - 1);
+
+  rval(0) = L.index (inner_slice);
   rval(1) = ids_to_label.size ();
   return rval;
 }
diff --git a/src/union-find.h++ b/src/union-find.h++
--- a/src/union-find.h++
+++ b/src/union-find.h++
@@ -71,8 +71,6 @@
     voxel *v1 = voxels[root1], *v2 = voxels[root2];
     if (root1 != root2)
       {
-
-
         if ( v1->rank > v2->rank)
           v1->parent = root2;
         else if (v1->rank < v2->rank)