Merge pull request #38 from JuliaImages/teh/fix32bit

Fix errors on 32bit platforms
JuliaImages · Aug 19, 2017 · 533edd8 · 533edd8
2 parents 8e1541e + 7b98476
commit 533edd8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/imfilter.jl b/src/imfilter.jl
@@ -9,6 +9,9 @@ end
 @inline function imfilter(::Type{T}, img::AbstractArray, kernel::Union{ArrayLike,Laplacian}, args...) where T
     imfilter(T, img, factorkernel(kernel), args...)
 end
+@inline function imfilter(::Type{T}, img::AbstractArray{TI}, kernel::AbstractArray{TK}, args...) where {T<:Integer,TI<:Integer,TK<:Integer}
+    imfilter(T, img, (kernel,), args...)
+end
 
 # Step 3: if necessary, fill in the default border
 function imfilter(::Type{T}, img::AbstractArray, kernel::ProcessedKernel, args...) where T

diff --git a/test/specialty.jl b/test/specialty.jl
@@ -35,6 +35,9 @@ using Base.Test
                   makeimpulse(RGB{Float32}, (5,), 3),
                   makeimpulse(RGB{N0f8}, (5,), 3))
             af = imfilter(a, kern)
+            if eltype(a) == unsigned(Int)
+                continue  # the concatenation below fails
+            end
             T = eltype(a)
             @test af == [zero(T),a[3],-2a[3],a[3],zero(T)]
             af = imfilter(a, (kern,))