mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 05:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4006 from sgjava:opencv-steve

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-05-13 11:36:15 +00:00
commit 4743184078
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/java/generator/gen_java.py
View File

@ -14,7 +14,7 @@ class_ignore_list = (
#core #core
"FileNode", "FileStorage", "KDTree", "KeyPoint", "DMatch", "FileNode", "FileStorage", "KDTree", "KeyPoint", "DMatch",
#videoio #videoio
"VideoWriter", #"VideoWriter",
) )
const_ignore_list = ( const_ignore_list = (
@ -61,9 +61,9 @@ const_ignore_list = (
"CV_CAP_PROP_POS_MSEC", "CV_CAP_PROP_POS_MSEC",
"CV_CAP_PROP_POS_FRAMES", "CV_CAP_PROP_POS_FRAMES",
"CV_CAP_PROP_POS_AVI_RATIO", "CV_CAP_PROP_POS_AVI_RATIO",
"CV_CAP_PROP_FPS", #"CV_CAP_PROP_FPS",
"CV_CAP_PROP_FOURCC", #"CV_CAP_PROP_FOURCC",
"CV_CAP_PROP_FRAME_COUNT", #"CV_CAP_PROP_FRAME_COUNT",
"CV_CAP_PROP_FORMAT", "CV_CAP_PROP_FORMAT",
"CV_CAP_PROP_MODE", "CV_CAP_PROP_MODE",
"CV_CAP_PROP_BRIGHTNESS", "CV_CAP_PROP_BRIGHTNESS",
@ -1530,8 +1530,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
# finalize() # finalize()
ci.j_code.write( ci.j_code.write(
""" """
@Override protected void delete() {
protected void finalize() throws Throwable {
delete(nativeObj); delete(nativeObj);
} }
""" ) """ )