Mercurial Hosting > traffic-intelligence
changeset 406:37c7b46f6e21
update to OpenCV 2.6
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Wed, 07 Aug 2013 11:42:34 -0400 |
| parents | a9e275b4ecb7 |
| children | 5eeb3b9fb568 |
| files | python/cvutils.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/python/cvutils.py Wed Jul 31 02:54:18 2013 -0400 +++ b/python/cvutils.py Wed Aug 07 11:42:34 2013 -0400 @@ -84,7 +84,7 @@ H, mask = cv2.findHomography(srcPoints, dstPoints, method, ransacReprojThreshold) return H - def arrayToCvMat(a, t = cv2.cv.CV_64FC1): + def arrayToCvMat(a, t = cv2.CV_64FC1): '''Converts a numpy array to an OpenCV CvMat, with default type CV_64FC1.''' print('Deprecated, use new interface') cvmat = cv2.cv.CreateMat(a.shape[0], a.shape[1], t) @@ -122,7 +122,7 @@ key = -1 ret = True frameNum = firstFrameNum - capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, firstFrameNum) + capture.set(cv2.CAP_PROP_POS_FRAMES, firstFrameNum) while ret and not quitKey(key): ret, img = capture.read() if ret: @@ -141,9 +141,9 @@ images = [] capture = cv2.VideoCapture(videoFilename) if capture.isOpened(): - nDigits = int(floor(log10(capture.get(cv2.cv.CV_CAP_PROP_FRAME_COUNT))))+1 + nDigits = int(floor(log10(capture.get(cv2.CAP_PROP_FRAME_COUNT))))+1 ret = False - capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, firstFrameNum) + capture.set(cv2.CAP_PROP_POS_FRAMES, firstFrameNum) imgNum = 0 while imgNum<nFrames: ret, img = capture.read() @@ -166,7 +166,7 @@ def getFPS(videoFilename): capture = cv2.VideoCapture(videoFilename) if capture.isOpened(): - fps = capture.get(cv2.cv.CV_CAP_PROP_FPS) + fps = capture.get(cv2.CAP_PROP_FPS) capture.release() return fps else: @@ -180,7 +180,7 @@ key = -1 ret = True frameNum = firstFrameNum - capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, firstFrameNum) + capture.set(cv2.CAP_PROP_POS_FRAMES, firstFrameNum) if not lastFrameNumArg: from sys import maxint lastFrameNum = maxint