Various fixes for new cameramap() API

* Fix broken refactor which still referred to focal_length, etc
* Fix tests

Author: Chris Foster

src/perspective.jl

@@ -59,10 +59,11 @@ corner of your imaging sensor. This measurement is in the units after applying
 """
 cameramap() = PerspectiveMap()
 cameramap(scale::Number) =
-    LinearMap(UniformScaling(focal_length/pixel_size)) ∘ PerspectiveMap()
+    LinearMap(UniformScaling(scale)) ∘ PerspectiveMap()
 cameramap(scale::Tuple{Number, Number}) =
-    LinearMap(SMatrix{2,2}(scale[1],0,0,scale[2])) ∘ PerspectiveMap()
+    LinearMap(@SMatrix([scale[1] 0; 0 scale[2]])) ∘ PerspectiveMap()
 cameramap(scale::Number, offset::Tuple{Number,Number}) =
-    AffineMap(UniformScaling(focal_length/pixel_size), SVector(-offset[1], -offset[2])) ∘ PerspectiveMap()
+    AffineMap(UniformScaling(scale), SVector(-offset[1], -offset[2])) ∘ PerspectiveMap()
 cameramap(scale::Tuple{Number, Number}, offset::Tuple{Number,Number}) =
-    AffineMap(SMatrix{2,2}(scale[1],0,0,scale[2]), SVector(-offset[1], -offset[2])) ∘ PerspectiveMap()
+    AffineMap(@SMatrix([scale[1] 0; 0 scale[2]]), SVector(-offset[1], -offset[2])) ∘ PerspectiveMap()
+

test/perspective.jl

@@ -1,8 +1,8 @@
 @testset "Perspective transformation" begin
     @test PerspectiveMap()([2.0, -1.0, 0.5]) ≈ [4.0, -2.0]
 
-    @test cameramap() === PerspectiveMap()
-    @test cameramap(pixel_size = 3e-5, focal_length = 0.3) ≈ LinearMap(UniformScaling(1e4)) ∘ PerspectiveMap()
-    @test cameramap(origin = [1.0,2.0,3.0], orientation = [0 1 0; 0 0 1; 1 0 0]) ≈ PerspectiveMap() ∘ AffineMap([0 0 1; 1 0 0; 0 1 0], [-3.0, -1.0, -2.0])
-    @test cameramap(offset_x = 100, offset_y = 20) ≈ Translation(SVector(-100, -20)) ∘ PerspectiveMap()
+    @test cameramap(2.0)                  ≈ LinearMap(UniformScaling(2.0)) ∘ PerspectiveMap()
+    @test cameramap((1.1,2.2))            ≈ LinearMap([1.1 0; 0 2.2]) ∘ PerspectiveMap()
+    @test cameramap(1.1,       (3.3,4.4)) ≈ Translation([-3.3,-4.4]) ∘ LinearMap(UniformScaling(1.1)) ∘ PerspectiveMap()
+    @test cameramap((1.1,2.2), (3.3,4.4)) ≈ Translation([-3.3,-4.4]) ∘ LinearMap([1.1 0; 0 2.2]) ∘ PerspectiveMap()
 end