wip5

yakir12 · Dec 19, 2024 · 930d0ba · 930d0ba
1 parent d09d4b0
commit 930d0ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/detect_fit.jl b/src/detect_fit.jl
@@ -30,15 +30,17 @@ function fit_model(sz, objpoints, imgpointss, n_corners,  with_distortion, aspec
     imagePoints = OpenCV.InputArray[Float32.(reshape(stack(imgpoints), 2, 1, :)) for imgpoints in imgpointss]
     imageSize = OpenCV.Size{Int32}(sz...)
 
-    cammat = convert(Matrix{Float64}, I(3))
+    cammat = convert(Matrix{Float32}, I(3))
     cammat[1,:] .= aspect
     cameraMatrix = OpenCV.Mat(Float32.(reshape(cammat, 1, 3, 3)))
     distCoeffs = OpenCV.Mat(Array{Float32}(undef, 1, 1, 5))
 
     flags = OpenCV.CALIB_ZERO_TANGENT_DIST + OpenCV.CALIB_FIX_K3 + OpenCV.CALIB_FIX_K2 + (with_distortion ? 0 : OpenCV.CALIB_FIX_K1) + OpenCV.CALIB_FIX_ASPECT_RATIO
 
-    r = OpenCV.InputArray[Array{Float32}(undef, 3, 1, prod(n_corners)) for _ in 1:nfiles]
-    t = OpenCV.InputArray[Array{Float32}(undef, 3, 1, prod(n_corners)) for _ in 1:nfiles]
+    # r = OpenCV.InputArray[Array{Float32}(undef, 3, 1, prod(n_corners)) for _ in 1:nfiles]
+    r = OpenCV.InputArray[ones(Float32, 3, 1, prod(n_corners)) for _ in 1:nfiles]
+    # t = OpenCV.InputArray[Array{Float32}(undef, 3, 1, prod(n_corners)) for _ in 1:nfiles]
+    t = OpenCV.InputArray[ones(Float32, 3, 1, prod(n_corners)) for _ in 1:nfiles]
 
     x, mtx, dist, rvecs, tvecs = OpenCV.calibrateCamera(objectPoints, imagePoints, imageSize, cameraMatrix, distCoeffs, r, t, flags, CRITERIA)
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -68,6 +68,9 @@ end
                 _, xys2 = CameraCalibrations._detect_corners(file, n_corners, sz)
                 return xys2
             end
+            if xys ≠ xys2
+                @show n_corners, ratio
+            end
             @test xys == xys2
         end
     end