Bump DataStructures compat to 0.19 (#141)

* Switch to DataStructures 0.19: push, popfirst instead of enqueue, dequeue

* Three-arg enqueue just pushes a pair

* dequeue_pair can go too

Author: Ickaser

Project.toml

@@ -12,7 +12,7 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 TiledIteration = "06e1c1a7-607b-532d-9fad-de7d9aa2abac"
 
 [compat]
-DataStructures = "0.17.11, 0.18"
+DataStructures = "0.19"
 Documenter = "0.24, 0.25, 0.26, 0.27"
 ImageCore = "0.9, 0.10"
 LoopVectorization = "0.12"

src/ImageMorphology.jl

@@ -1,6 +1,6 @@
 module ImageMorphology
 
-using DataStructures: Queue, enqueue!, dequeue!
+using DataStructures: Queue
 using ImageCore
 using ImageCore: GenericGrayImage, MappedArrays, FixedPointNumbers
 using OffsetArrays

src/connected.jl

@@ -512,10 +512,10 @@ function _generic_naive_labeling!(out, img, se, can_be_labelled=(x) -> true, is_
             # mark point as visited
             @inbounds visited[i] = true
             @inbounds out[i] = curr_label
-            enqueue!(propagationfront, i)
+            push!(propagationfront, i)
             while !isempty(propagationfront)
                 #get indice from propagationfront
-                idx_front = dequeue!(propagationfront)
+                idx_front = popfirst!(propagationfront)
                 # get value at current point
                 @inbounds centervalue = img[idx_front]
                 if can_be_labelled(centervalue) # eg could be specialize for no background
@@ -528,7 +528,7 @@ function _generic_naive_labeling!(out, img, se, can_be_labelled=(x) -> true, is_
                             if is_connected(nl_value, centervalue)
                                 # yes, propagate the "connected" zones to this pixel
                                 @inbounds if !visited[ii]
-                                    enqueue!(propagationfront, ii)
+                                    push!(propagationfront, ii)
                                     # mark it as visited
                                     visited[ii] = true
                                     #propagate label

src/leveling.jl

@@ -1,6 +1,6 @@
 import Base.isless
 import Base.isgreater
-import DataStructures.PriorityQueue, DataStructures.enqueue!, DataStructures.dequeue_pair!
+import DataStructures.PriorityQueue
 
 """
     low_leveling(op, marker, mask; [dims])
@@ -66,14 +66,14 @@ function _low_leveling!(out::AbstractArray{T,N}, ref::AbstractArray{T,N}, marker
             end
             if @inbounds current_max != out[i]
                 out[i] = min(ref[i], current_max)
-                enqueue!(pq, i, out[i])
+                push!(pq, i => out[i])
             end
             # else posponed to the end
         end
     end
     # Loop until all pixel have been examined 
     while !isempty(pq)
-        curr_idx, _ = dequeue_pair!(pq)
+        curr_idx, _ = popfirst!(pq)
         for Δi in se # examine neighborhoods
             ii = curr_idx + Δi
             if checkbounds(Bool, R, ii) #check that we are in the image
@@ -159,14 +159,14 @@ function _high_leveling!(out::AbstractArray{T,N}, ref::AbstractArray{T,N}, marke
             end
             if @inbounds current_min != out[i]
                 out[i] = max(ref[i], current_min)
-                enqueue!(pq, i, out[i])
+                push!(pq, i => out[i])
             end
             # else posponed to the end
         end
     end
     # Loop until all pixel have been examined 
     while !isempty(pq)
-        curr_idx, _ = dequeue_pair!(pq)
+        curr_idx, _ = popfirst!(pq)
         for Δi in se # examine neighborhoods
             ii = curr_idx + Δi
             if checkbounds(Bool, R, ii) #check that we are in the image

src/ops/mreconstruct.jl

@@ -86,8 +86,8 @@ end
 _prepare_reconstruct_ops(::op) where {op} = error("operation `$(op.instance)` is not supported for `mreconstruct`")
 _prepare_reconstruct_ops(::typeof(dilate)) = (max, min)
 _prepare_reconstruct_ops(::typeof(erode)) = (min, max)
-@inline _should_enqueue(::typeof(max)) = <
-@inline _should_enqueue(::typeof(min)) = >
+@inline _should_push(::typeof(max)) = <
+@inline _should_push(::typeof(min)) = >
 
 # Single-CPU version, references are [1] and section 6.2 of [2]
 function _mreconstruct!((select_se, select_marker), out, marker, mask, se)
@@ -135,7 +135,7 @@ function _mreconstruct!((select_se, select_marker), out, marker, mask, se)
         @inbounds out[i] = select_marker(curr_val, mask[i])
     end
     # backward scan
-    should_enqueue = _should_enqueue(select_se)
+    should_push = _should_push(select_se)
     for i in reverse(R)
         @inbounds curr_val = out[i]
         for Δi in lower_se # examine neighborhoods
@@ -148,21 +148,21 @@ function _mreconstruct!((select_se, select_marker), out, marker, mask, se)
         for Δi in lower_se # examine neighborhoods
             ii = i + Δi
             if checkbounds(Bool, R, ii) #check that we are in the image
-                @inbounds if should_enqueue(out[ii], out[i]) && should_enqueue(out[ii], mask[ii])
-                    enqueue!(queue, i)
+                @inbounds if should_push(out[ii], out[i]) && should_push(out[ii], mask[ii])
+                    push!(queue, i)
                 end
             end
         end
     end
     # Loop until all pixel have been examined
     while !isempty(queue)
-        curr_idx = dequeue!(queue)
+        curr_idx = popfirst!(queue)
         for Δi in se # examine neighborhoods
             ii = curr_idx + Δi
             if checkbounds(Bool, R, ii) #check that we are in the image
-                @inbounds if should_enqueue(out[ii], out[curr_idx]) && mask[ii] != out[ii]
+                @inbounds if should_push(out[ii], out[curr_idx]) && mask[ii] != out[ii]
                     out[ii] = select_marker(out[curr_idx], mask[ii])
-                    enqueue!(queue, ii)
+                    push!(queue, ii)
                 end
             end
         end