strip tuple wrapper to speed up centroid calc (#20)

continuation of JuliaImages/Images.jl#810
JuliaImages · Jun 6, 2019 · 28e66f0 · 28e66f0
1 parent da06f83
commit 28e66f0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ImageMorphology/src/connected.jl b/ImageMorphology/src/connected.jl
@@ -274,10 +274,12 @@ end
 "`component_centroids(labeled_array)` -> an array of centroids for each label, including the background label 0"
 function component_centroids(img::AbstractArray{Int,N}) where N
     len = length(0:maximum(img))
-    n = fill((zero(CartesianIndex{N}), 0), len)
+    n = fill(zero(CartesianIndex{N}), len)
+    counts = fill(0, len)
     @inbounds for I in CartesianIndices(size(img))
         v = img[I] + 1
-        n[v] = n[v] .+ (I, 1)
+        n[v] += I
+        counts[v] += 1
     end
-    map(v -> n[v][1].I ./ n[v][2], 1:len)
+    map(v -> n[v].I ./ counts[v], 1:len)
 end