revert unnecessary file changes

thorbenk · Mar 25, 2014 · 6fbcf31 · 6fbcf31
1 parent fcdf001
commit 6fbcf31
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/blockedarray/opBlockedConnectedComponents.py b/blockedarray/opBlockedConnectedComponents.py
@@ -33,7 +33,7 @@ def _updateSlice(self, c, t, bg):
         source = self._getSource(c, t)
         sink = self._getSink(c, t)
         #TODO enable 2d
-        blockShape = tuple([int(s) for s in self._cache.BlockShape.value[:3]])
+        blockShape = _v2tup(self._cache.BlockShape.value, dim=3)
         CC = self._ccMap3[self.Input.meta.dtype]
         cc = CC(source, blockShape)
 
@@ -93,5 +93,5 @@ def setupOutputs(self):
             assert s == "xyzct", "Input must be in xyzct order, if any"
 
 
-def _v2tup(v, d=3):
-    return tuple([int(v[i]) for i in range(d)])
+def _v2tup(v, dim=3):
+    return tuple([int(v[i]) for i in range(dim)])
diff --git a/include/bw/sink.h b/include/bw/sink.h
@@ -44,7 +44,7 @@ class Sink {
     public:
     typedef typename Roi<N>::V V;
 
-    Sink() {};
+    Sink() {}
     virtual ~Sink() {};
 
     /* has to be called before any calls to writeBlock */

diff --git a/include/bw/source.h b/include/bw/source.h
@@ -44,7 +44,7 @@ class Source {
     public:
     typedef typename Roi<N>::V V;
 
-    Source() {};
+    Source() {}
     virtual ~Source() {};
 
     /**