Merge pull request #43 from lorenzoh/lorenzoh/hotfix

Hotfixes

Author: lorenzoh

src/projective/affine.jl

@@ -40,21 +40,23 @@ end
 
 
 function getprojection(scale::ScaleKeepAspect{N}, bounds; randstate = nothing) where N
-    ratio = maximum(scale.minlengths ./ length.(bounds.rs))
+    # Offset `minlengths` by 1 to avoid black border on one side
+    ratio = maximum((scale.minlengths .+ 1) ./ length.(bounds.rs))
     upperleft = SVector{N, Float32}(minimum.(bounds.rs)) .- 1
     P = scaleprojection(Tuple(ratio for _ in 1:N))
     if upperleft != SVector(0, 0)
-        P = P  ∘ Translation(-upperleft)
+        P = P ∘ Translation(-upperleft)
     end
     return P
 end
 
 function projectionbounds(tfm::ScaleKeepAspect{N}, P, bounds::Bounds{N}; randstate = nothing) where N
     origsz = length.(bounds.rs)
-    ratio = maximum(tfm.minlengths ./ origsz)
-    sz = round.(Int, ratio .* origsz)
+    ratio = maximum((tfm.minlengths) ./ origsz)
+    sz = floor.(Int,ratio .* origsz)
     bounds_ = transformbounds(bounds, P)
-    return offsetcropbounds(sz, bounds_, ntuple(_ -> 1., N))
+    bs_ = offsetcropbounds(sz, bounds_, ntuple(_ -> 1., N))
+    return bs_
 end
 
 """
@@ -71,7 +73,7 @@ end
 
 
 function getprojection(scale::ScaleFixed, bounds; randstate = nothing)
-    ratios = scale.sizes ./ length.(bounds.rs)
+    ratios = (scale.sizes .+ 1) ./ length.(bounds.rs)
     upperleft = SVector{2, Float32}(minimum.(bounds.rs)) .- 1
     P = scaleprojection(ratios)
     if upperleft != SVector(0, 0)
@@ -209,11 +211,12 @@ at one.
 struct PinOrigin <: ProjectiveTransform end
 
 function getprojection(::PinOrigin, bounds; randstate = nothing)
-    # TODO: translate by actual minimum x and y coordinates
-    return Translation((-SVector{2, Float32}(minimum.(bounds.rs))) .+ 1)
+    p = (-SVector{2, Float32}(minimum.(bounds.rs))) .+ 1
+    P = Translation(p)
+    return P
 end
 
-function apply(::PinOrigin, item::Union{Image, MaskMulti, MaskBinary}; randstate = nothing)
+function apply(::PinOrigin, item::Union{<:Image, <:MaskMulti, <:MaskBinary}; randstate = nothing)
     item = @set item.data = parent(itemdata(item))
     item = @set item.bounds = Bounds(size(itemdata(item)))
     return item
@@ -229,6 +232,8 @@ end
 # This overwrites the default composition.
 
 compose(cropped::CroppedProjectiveTransform, pin::PinOrigin) = Sequence(cropped, pin)
+compose(cropped::ComposedProjectiveTransform, pin::PinOrigin) = Sequence(cropped, pin)
+compose(cropped::ProjectiveTransform, pin::PinOrigin) = Sequence(cropped, pin)
 
 # ## Resize crops
 

src/projective/crop.jl

@@ -84,8 +84,10 @@ function projectionbounds(
     sz = length.(ranges)
     pad = (cropped.crop.by .- (sz .% cropped.crop.by)) .% cropped.crop.by
 
-    indices = UnitRange.(getindex.(ranges, 1), sz .+ pad)
-    return Bounds(indices)
+    start = minimum.(ranges)
+    end_ = start .+ sz .+ pad .- 1
+    rs = UnitRange.(start, end_)
+    return Bounds(rs)
 end
 
 

src/projective/warp.jl

@@ -18,11 +18,12 @@ function getprojection(
         randstate = getrandstate(tfm))
     T = Float32
     rng = Random.seed!(Random.MersenneTwister(), randstate)
-    scale = sqrt(prod(sum.(bounds.rs)))
+    scale = sqrt(prod(length.(bounds.rs)))
 
     srcps = shuffle(rng, SVector{2, T}.(corners(bounds)))[1:3]
     offsets = rand(rng, SVector{2, T}, 3)
 	offsets = map(v -> (v .* (2one(T)) .- one(T)) .* convert(T, scale * tfm.σ), offsets)
+
 	return threepointwarpaffine(srcps, srcps .+ offsets)
 end
 

test/projective/affine.jl

@@ -60,12 +60,9 @@ include("../imports.jl")
         imbounds = getbounds(image)
         kpbounds = getbounds(keypoints)
         tfm1 = ScaleKeepAspect((50, 50))
-        @test getprojection(tfm1, imbounds) ≈ getprojection(ScaleRatio((1, 1)), imbounds)
-        @test getprojection(tfm1, kpbounds) ≈ getprojection(ScaleRatio((1, 1)), kpbounds)
-
         tfm2 = ScaleKeepAspect((25, 25))
-        @test getprojection(tfm2, imbounds) ≈ getprojection(ScaleRatio((1 / 2, 1 / 2)), imbounds)
-        @test getprojection(tfm2, kpbounds) ≈ getprojection(ScaleRatio((1 / 2, 1 / 2)), kpbounds)
+        testprojective(tfm1)
+        testprojective(tfm2)
     end
 
 
@@ -79,7 +76,7 @@ include("../imports.jl")
             @test_nowarn apply(tfm, keypoints)
             timage = apply(tfm, image)
             tkeypoints = apply(tfm, keypoints)
-            @test getbounds(timage).rs == (1:25, 1:25)
+            @test length.(getbounds(timage).rs) == (25, 25)
             @test getbounds(timage) == getbounds(tkeypoints)
             testprojective(tfm)
 

test/projective/crop.jl

@@ -25,6 +25,5 @@ end
     item = Image(img)
     tfm = ResizePadDivisible((32, 32), 4)
     titem = apply(tfm, item)
-    @show size(titem.data)
     @test size(titem.data) == (32, 48)
 end