Merged the trunk till r8291

2012-05-18 12:18:17 +00:00
parent caddd398e6
commit 50ad690993
25 changed files with 143 additions and 64 deletions
--- a/modules/java/gen_java.py
+++ b/modules/java/gen_java.py
@@ -173,6 +173,15 @@ missing_consts = \
        ) # public
    }, # Calib3d

+    "Video":
+    {
+        'private' :
+        (
+            ('CV_LKFLOW_INITIAL_GUESSES',    4 ),
+            ('CV_LKFLOW_GET_MIN_EIGENVALS',  8 ),
+        ) # private
+    }, # Video
+
 }