fixed "import cv" in the new python samples. corrected Python bindings to match the documentation and vice versa (NOTE: in cv2.stereoCalibrate the parameter ordering has been changed)

samples/python2/calibrate.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 import os
 from common import splitfn
 
@@ -50,10 +51,7 @@ if __name__ == '__main__':
         
         print 'ok'
 
-    camera_matrix = np.zeros((3, 3))
-    dist_coefs = np.zeros(4)
-    img_n = len(img_points)
-    rms, camera_matrix, dist_coefs, rvecs, tvecs = cv2.calibrateCamera(obj_points, img_points, (w, h), camera_matrix, dist_coefs)
+    rms, camera_matrix, dist_coefs, rvecs, tvecs = cv2.calibrateCamera(obj_points, img_points, (w, h))
     print "RMS:", rms
     print "camera matrix:\n", camera_matrix
     print "distortion coefficients: ", dist_coefs.ravel()

samples/python2/coherence.py

@@ -7,7 +7,8 @@
 '''
 
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 
 
 def coherence_filter(img, sigma = 11, str_sigma = 11, blend = 0.5, iter_n = 4):

samples/python2/color_histogram.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 from time import clock
 import sys
 

samples/python2/common.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 import os
 
 image_extensions = ['.bmp', '.jpg', '.jpeg', '.png', '.tif', '.tiff', '.pbm', '.pgm', '.ppm']

samples/python2/distrans.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 from common import make_cmap
 
 help_message = '''USAGE: distrans.py [<image>]

samples/python2/edge.py

@@ -1,4 +1,5 @@
-import cv2, cv
+import cv2
+import cv2.cv as cv
 import video
 import sys
 

samples/python2/facedetect.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 from video import create_capture
 from common import clock, draw_str
 

samples/python2/find_obj.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 from common import anorm
 
 help_message = '''SURF image match 

samples/python2/floodfill.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 
 help_message = '''USAGE: floodfill.py [<image>]
 

samples/python2/lk_track.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 import video
 from common import anorm2, draw_str
 from time import clock
@@ -15,7 +16,7 @@ Keys:
 
 
 
-lk_params = dict( winSize  = (3, 3), 
+lk_params = dict( winSize  = (21, 21), 
                   maxLevel = 2, 
                   criteria = (cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, 10, 0.03),
                   derivLambda = 0.0 )    

samples/python2/motempl.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 import video
 from common import nothing, clock, draw_str
 

samples/python2/obj_detect.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 
 def detect(img, cascade):
     rects = cascade.detectMultiScale(img, scaleFactor=1.1, minNeighbors=5, minSize=(30, 30))

samples/python2/opt_flow.py

@@ -1,6 +1,7 @@
 import numpy as np
 import math
-import cv2, cv
+import cv2
+import cv2.cv as cv
 import video
 
 help_message = '''

samples/python2/stereo_match.py

@@ -5,7 +5,8 @@ Resulting .ply file cam be easily viewed using MeshLab (http://meshlab.sourcefor
 '''
 
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 
 ply_header = '''ply
 format ascii 1.0

samples/python2/turing.py

@@ -4,7 +4,8 @@ Inspired by http://www.jonathanmccabe.com/Cyclic_Symmetric_Multi-Scale_Turing_Pa
 '''
 
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 from common import draw_str
 import getopt, sys
 from itertools import count

samples/python2/watershed.py

@@ -1,5 +1,6 @@
 import numpy as np
-import cv2, cv
+import cv2
+import cv2.cv as cv
 from common import Sketcher
 
 help_message = '''