More fixes for Julia v0.7

src/ImageInpainting.jl

@@ -3,8 +3,6 @@
 # Licensed under the ISC License. See LICENCE in the project root.
 # ------------------------------------------------------------------
 
-__precompile__()
-
 module ImageInpainting
 
 using ImageMorphology

src/crimisini.jl

@@ -46,7 +46,7 @@ function inpaint_impl(img::AbstractArray{T,N}, mask::BitArray{N}, algo::Crimisin
   padimg[isnan.(padimg)] .= zero(T)
 
   # inpainting frontier
-  δΩ = find(dilate(ϕ) - ϕ)
+  δΩ = findall(dilate(ϕ) .& .!ϕ)
 
   while !isempty(δΩ)
     # update confidence values in frontier
@@ -73,10 +73,8 @@ function inpaint_impl(img::AbstractArray{T,N}, mask::BitArray{N}, algo::Crimisin
     Δ[mask] .= Inf
 
     # find index in padded arrays
-    idx = argmin(Δ)
-    sub = ind2sub(size(Δ), idx)
-    padsub = [sub[i] + (tilesize[i]-1)÷2 for i in 1:length(tilesize)]
-    q = sub2ind(size(padimg), padsub...)
+    sub = argmin(Δ)
+    q = ntuple(i -> sub[i] + (tilesize[i]-1)÷2, N)
 
     # select best candidate
     ψᵦ, bᵦ = selectpatch((padimg, ϕ), tilesize, q)
@@ -87,7 +85,7 @@ function inpaint_impl(img::AbstractArray{T,N}, mask::BitArray{N}, algo::Crimisin
     bₚ[b] .= true
 
     # update frontier
-    δΩ = find(dilate(ϕ) - ϕ)
+    δΩ = findall(dilate(ϕ) .& .!ϕ)
   end
 
   view(padimg, [1+prepad[i]:size(padimg,i)-postpad[i] for i=1:N]...)

src/pointgradients.jl

@@ -42,9 +42,8 @@ function pointgradients(img::AbstractArray, points::AbstractVector; method=:ando
 
       A = zeros(size(kern))
       shape = size(kern)
-      for (k, p) in enumerate(points)
-        icenter = CartesianIndex(ind2sub(extent, p))
-        i1 = CartesianIndex(tuple(ones(Int, ndirs)...))
+      for (k, icenter) in enumerate(points)
+        i1 = CartesianIndex(ntuple(i->1, ndirs))
         for ii in CartesianIndices(shape)
           A[ii] = padimg[ii + icenter - i1]
         end

src/utils.jl

@@ -35,21 +35,18 @@ function convdist(img::AbstractArray, kern::AbstractArray; weights=nothing)
 end
 
 """
-    selectpatch(imgs, psize, p)
+    selectpatch(imgs, tilesize, center)
 
 Helper function to extract a patch of size
-`psize` from `imgs` centered at index `p`.
+`tilesize` from `imgs` centered at Cartesian
+index `center`.
 """
-function selectpatch(imgs, psize, p)
-  imsize = size(imgs[1])
-  N = length(imsize)
-
-  # patch center
-  center = ind2sub(imsize, p)
+function selectpatch(imgs, tilesize, center)
+  N = length(tilesize)
 
   # patch corners
-  start  = [center[i] - (psize[i]-1) ÷ 2 for i=1:N]
-  finish = [center[i] +     psize[i] ÷ 2 for i=1:N]
+  start  = ntuple(i -> center[i] - (tilesize[i]-1) ÷ 2, N)
+  finish = ntuple(i -> center[i] +     tilesize[i] ÷ 2, N)
 
   [view(img, [start[i]:finish[i] for i=1:N]...) for img in imgs]
 end