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/video_dmtx.py
+++ b/samples/python2/video_dmtx.py
@@ -1,4 +1,4 @@
-help='''
+'''
 Data matrix detector sample.
 Usage:
   video_dmtx {<video device number>|<video file name>}
@@ -52,7 +52,7 @@ def data_matrix_demo(cap):


 if __name__ == '__main__':
-    print help
+    print __doc__

    if len(sys.argv) == 1:
        cap = cv2.VideoCapture(0)