fix(color_connectivity_graph): 6-connected was improperly limited to uint32

Author: william-silversmith

cc3d/cc3d_graphs.hpp

@@ -740,19 +740,9 @@ OUT* color_connectivity_graph_26(
 	return simplified_relabel<OUT>(out_labels, voxels, new_label, equivalences, N);
 }
 
-template <typename OUT>
-OUT* color_connectivity_graph_6(
-	const uint8_t* vcg, // voxel connectivity graph
-	const int64_t sx, const int64_t sy, const int64_t sz,
-	OUT* out_labels = NULL,
-	size_t &N = _dummy_N
-) {
-	throw new std::runtime_error("6-connectivity requires a 32-bit voxel graph for color_connectivity_graph_6.");
-}
-
-template <typename OUT>
+template <typename VCG_t, typename OUT>
 OUT* color_connectivity_graph_6(
-	const uint32_t* vcg, // voxel connectivity graph
+	const VCG_t* vcg, // voxel connectivity graph
 	const int64_t sx, const int64_t sy, const int64_t sz,
 	OUT* out_labels = NULL,
 	size_t &N = _dummy_N
@@ -1106,7 +1096,7 @@ OUT* color_connectivity_graph_N(
 		}
 	}
 	else if (connectivity == 6) {
-		return color_connectivity_graph_6<OUT>(vcg, sx, sy, sz, out_labels, N);
+		return color_connectivity_graph_6<VCG_t, OUT>(vcg, sx, sy, sz, out_labels, N);
 	}
 	else {
 		return color_connectivity_graph_26<OUT>(vcg, sx, sy, sz, out_labels, N);

cc3d/fastcc3d.pyx

@@ -963,8 +963,8 @@ def color_connectivity_graph(
   cdef int sy = shape[1]
   cdef int sz = shape[2]
 
-  if connectivity in [6, 26] and sz > 1 and dtype != np.uint32:
-    raise ValueError(f"Only uint32 is supported for 3d connectivites. Got: {vcg.dtype}")
+  if connectivity in [18, 26] and sz > 1 and dtype != np.uint32:
+    raise ValueError(f"Only uint32 is supported for 18 and 26 connected. Got: {vcg.dtype}")
 
   cdef uint8_t[:,:,:] arr_memview8u
   cdef uint32_t[:,:,:] arr_memview32u