wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-08-12 12:30:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed camera calib back to a 5 vec since we support opencv >= 2.0

Browse Source
This commit is contained in:
sccolbert
2009-10-24 16:06:32 +02:00
parent e3aa75df33
commit 0b0274f265
4 changed files with 187 additions and 8917 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scikits/image/opencv/opencv_backend.c
+1 -1210
View File
File diff suppressed because it is too large Load Diff
scikits/image/opencv/opencv_cv.c
+184 -7705
View File
File diff suppressed because it is too large Load Diff
scikits/image/opencv/opencv_cv.pyx
+1 -1
View File
@@ -1188,7 +1188,7 @@ def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points,
# Allocate a new distortion array
cdef np.npy_intp distortion_shape[2]
distortion_shape[0] = <np.npy_intp> 1
distortion_shape[1] = <np.npy_intp> 4
distortion_shape[1] = <np.npy_intp> 5
cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64)
cdef IplImage ipl_distortion
populate_iplimage(distortion, &ipl_distortion)
scikits/image/opencv/tests/test_opencv_cv.py
+1 -1
View File
@@ -237,7 +237,7 @@ class TestCalibrateCamera2(object):
np.array([16, 16, 16], dtype=np.int32), (4, 4)
)
assert_almost_equal(distortions, np.array([0., 0., 0., 0.,]))
assert_almost_equal(distortions, np.array([0., 0., 0., 0., 0.]))
# The intrinsics will be strange, but we can at least check
# for known zeros and ones
assert_almost_equal( intrinsics[0,1], 0)