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

Use .npz test data in opencv tests.

Browse Source
This commit is contained in:
Stefan van der Walt
2011-10-11 19:03:27 -07:00
parent ece0363264
commit c60d490a99
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scikits/image/opencv/tests/test_opencv_cv.py
+10 -12
View File
@@ -23,8 +23,8 @@ with warnings.catch_warnings():
opencv_skip = dec.skipif(not loaded, 'OpenCV libraries not found')
class OpenCVTest(object):
lena_RGB_U8 = np.load(os.path.join(data_dir, 'lena_RGB_U8.npy'))
lena_GRAY_U8 = np.load(os.path.join(data_dir, 'lena_GRAY_U8.npy'))
lena_RGB_U8 = np.load(os.path.join(data_dir, 'lena_RGB_U8.npz'))['arr_0']
lena_GRAY_U8 = np.load(os.path.join(data_dir, 'lena_GRAY_U8.npy'))['arr_0']
class TestSobel(OpenCVTest):
@@ -239,18 +239,18 @@ class TestPyrUp(OpenCVTest):
class TestFindChessboardCorners(object):
@opencv_skip
def test_cvFindChessboardCorners(self):
chessboard_GRAY_U8 = np.load(os.path.join(data_dir,
'chessboard_GRAY_U8.npy'))
chessboard_GRAY_U8 = np.load(
os.path.join(data_dir, 'chessboard_GRAY_U8.npz')['arr_0'])
pts = cvFindChessboardCorners(chessboard_GRAY_U8, (7, 7))
class TestDrawChessboardCorners(object):
@opencv_skip
def test_cvDrawChessboardCorners(self):
chessboard_GRAY_U8 = np.load(os.path.join(data_dir,
'chessboard_GRAY_U8.npy'))
chessboard_RGB_U8 = np.load(os.path.join(data_dir,
'chessboard_RGB_U8.npy'))
chessboard_GRAY_U8 = np.load(
os.path.join(data_dir, 'chessboard_GRAY_U8.npz')['arr_0'])
chessboard_RGB_U8 = np.load(
os.path.join(data_dir, 'chessboard_RGB_U8.npz')['arr_0'])
corners = cvFindChessboardCorners(chessboard_GRAY_U8, (7, 7))
cvDrawChessboardCorners(chessboard_RGB_U8, (7, 7), corners)
@@ -285,10 +285,8 @@ class TestCalibrateCamera2(object):
@opencv_skip
@dec.slow
def test_cvCalibrateCamera2_KnownData(self):
(object_points,points_count,image_points,intrinsics,distortions) =\
cPickle.load(open(os.path.join(
data_dir, "cvCalibrateCamera2TestData.pck"), "rb")
)
_, (object_points,points_count,image_points,intrinsics,distortions) = \
np.load(os.path.join(data_dir, "cvCalibrateCamera2TestData.npz"))
intrinsics_test, distortion_test = cvCalibrateCamera2(
object_points, image_points, points_count, (1024,1280)