Merged the trunk r8408:8457 (inclusive)

2012-05-30 08:47:34 +00:00
parent 7b5a45eac4
commit 949c4edf41
42 changed files with 828 additions and 266 deletions
--- a/samples/python2/lk_homography.py
+++ b/samples/python2/lk_homography.py
@@ -25,8 +25,7 @@ from common import draw_str

 lk_params = dict( winSize  = (19, 19), 
                  maxLevel = 2, 
-                  criteria = (cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, 10, 0.03),
-                  derivLambda = 0.0 )    
+                  criteria = (cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, 10, 0.03))    

 feature_params = dict( maxCorners = 1000, 
                       qualityLevel = 0.01,