Merge pull request #511 from aritzlc:master

2013-02-27 19:33:01 +04:00
parent 242a6de719 0448f240a0
commit 7b79eaf5be
5 changed files with 95 additions and 40 deletions
--- a/modules/java/generator/gen_java.py
+++ b/modules/java/generator/gen_java.py
@@ -165,6 +165,8 @@ missing_consts = \
            ('CV_CALIB_FIX_K5',           4096),
            ('CV_CALIB_FIX_K6',           8192),
            ('CV_CALIB_RATIONAL_MODEL',  16384),
+            ('CV_CALIB_THIN_PRISM_MODEL',32768),
+            ('CV_CALIB_FIX_S1_S2_S3_S4', 65536),
            ('CV_CALIB_FIX_INTRINSIC',     256),
            ('CV_CALIB_SAME_FOCAL_LENGTH', 512),
            ('CV_CALIB_ZERO_DISPARITY',   1024),