Merge pull request #148

Use higher precision in imrotate

Author: timholy

Project.toml

@@ -27,11 +27,12 @@ julia = "1"
 
 [extras]
 EndpointRanges = "340492b5-2a47-5f55-813d-aca7ddf97656"
+ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
 ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
 
 [targets]
-test = ["EndpointRanges", "ImageMagick", "LinearAlgebra", "ReferenceTests", "Test", "TestImages"]
+test = ["EndpointRanges", "ImageIO", "ImageMagick", "LinearAlgebra", "ReferenceTests", "Test", "TestImages"]

src/warp.jl

@@ -244,7 +244,11 @@ mosaicview([imgr for _ in 1:9]; nrow=3)
 """
 function imrotate(img::AbstractArray{T}, θ::Real, inds::Union{Tuple, Nothing} = nothing; kwargs...) where T
     # TODO: expose rotation center as a keyword
-    θ = floor(mod(θ,2pi)*typemax(Int16))/typemax(Int16) # periodic discretezation
+    Δ = eps(θ)
+    θ = mod2pi(θ)
+    if abs(θ) <= Δ || abs(θ - 2π) <= Δ
+        θ = zero(θ)
+    end
     tform = recenter(RotMatrix{2}(θ), center(img))
     # Use the `nothing` trick here because moving the `autorange` as default value is not type-stable
     inds = isnothing(inds) ? autorange(img, inv(tform)) : inds

test/warp.jl

@@ -268,13 +268,13 @@ img_camera = testimage("camera")
         img = similar(img_camera)
         v = view(img, 75:195, 245:370)
         v .= view(img_camera, v.indices...)
-        
+
         wv = InvWarpedView(v, tfm)
         @test wv isa InvWarpedView
         @test parent(wv) == v
         @test axes(wv) == (-78:82, 72:234)
         # boundaries are filled with 0 values
-        @test all(wv[first(axes(wv, 1)), :] .== 0) 
+        @test all(wv[first(axes(wv, 1)), :] .== 0)
         @test all(wv[last(axes(wv, 1)), :] .== 0)
         @test all(wv[:, first(axes(wv, 2))] .== 0)
         @test all(wv[:, last(axes(wv, 2))] .== 0)
@@ -453,5 +453,17 @@ NaN  NaN      NaN      NaN      NaN      NaN      NaN
                 end
             end
         end
+
+        @testset "issue #147" begin
+            img = Float64[1 2 3 4; 5 6 7 8; 9 10 11 12; 13 14 15 16]
+            trfm = recenter(RotMatrix(pi/2), center(img))
+            @test imrotate(img, π/2) ≈ warp(img, trfm) ≈ rotr90(img)
+            @test  any(isnan, imrotate(img, π/3))
+            @test !any(isnan, imrotate(img, π/3; fillvalue=0.0))
+            @test !any(isnan, imrotate(img, π/3, fillvalue=0.0))
+            @test  any(isnan, imrotate(img, π/3, axes(img)))
+            @test !any(isnan, imrotate(img, π/3, axes(img); fillvalue=0.0))
+            @test !any(isnan, imrotate(img, π/3, axes(img), fillvalue=0.0))
+        end
     end
 end