Mercurial Hosting > traffic-intelligence
diff python/cvutils.py @ 549:b5525249eda1
Merged in mohamedgomaa/trafficintelligence (pull request #7)
add some functions for behaviour analysis and corrected a few bugs
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Tue, 08 Jul 2014 16:32:09 -0400 |
| parents | 9816fab353f3 e6ab4caf359c |
| children | 9202628a4130 |
line wrap: on
line diff
--- a/python/cvutils.py Tue Jul 08 15:51:43 2014 -0400 +++ b/python/cvutils.py Tue Jul 08 16:32:09 2014 -0400 @@ -210,7 +210,7 @@ croppedImg = img[yCropMin : yCropMax, xCropMin : xCropMax] else: croppedImg = [] - return imgcrop, yCropMin, yCropMax, xCropMin, xCropMax + return croppedImg, yCropMin, yCropMax, xCropMin, xCropMax def displayTrajectories(videoFilename, objects, boundingBoxes = {}, homography = None, firstFrameNum = 0, lastFrameNumArg = None, printFrames = True, rescale = 1., nFramesStep = 1, saveAllImages = False, undistort = False, intrinsicCameraMatrix = None, distortionCoefficients = None, undistortedImageMultiplication = 1.): @@ -425,7 +425,7 @@ prod = dot(homography, augmentedPoints) return prod[0:2]/prod[2] else: - return p + return points def project(homography, p): '''Returns the coordinates of the projection of the point p with coordinates p[0], p[1]