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

BUG: OpenCV checks shape of memory provided.

Browse Source
This commit is contained in:
Stefan van der Walt
2010-12-01 16:50:00 +02:00
parent 4cd7acc8f5
commit d243713848
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scikits/image/opencv/opencv_cv.pyx
+5 -2
View File
@@ -2543,7 +2543,10 @@ def cvFindFundamentalMat(points1, points2, int method=CV_FM_RANSAC,
cdef np.npy_intp fundamental_shape[2]
cdef np.npy_intp status_shape[1]
fundamental_shape[0] = <np.npy_intp> 9
if (status == CV_FM_7POINT):
fundamental_shape[0] = <np.npy_intp> 9
else:
fundamental_shape[0] = <np.npy_intp> 3
fundamental_shape[1] = <np.npy_intp> 3
status_shape[0] = <np.npy_intp> points1.shape[0]
@@ -2578,7 +2581,7 @@ def cvFindFundamentalMat(points1, points2, int method=CV_FM_RANSAC,
if m == 0:
return (None, status)
else:
return (F[:m, :].reshape((m, 3, 3)), shape)
return (F.reshape((m, 3, 3)), status)
#------------------------