mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert of "Merge pull request #4006 from sgjava:opencv-steve" (reverted from commit 4743184078)

Browse Source
This commit is contained in:
Andrey Pavlenko 2015-05-19 18:52:59 +03:00
parent d67d32af48
commit ab8afc3bcc
1 changed files with 6 additions and 5 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
"FileNode", "FileStorage", "KDTree", "KeyPoint", "DMatch",
#videoio
#"VideoWriter",
"VideoWriter",
)
const_ignore_list = (
@ -61,9 +61,9 @@ const_ignore_list = (
"CV_CAP_PROP_POS_MSEC",
"CV_CAP_PROP_POS_FRAMES",
"CV_CAP_PROP_POS_AVI_RATIO",
#"CV_CAP_PROP_FPS",
#"CV_CAP_PROP_FOURCC",
#"CV_CAP_PROP_FRAME_COUNT",
"CV_CAP_PROP_FPS",
"CV_CAP_PROP_FOURCC",
"CV_CAP_PROP_FRAME_COUNT",
"CV_CAP_PROP_FORMAT",
"CV_CAP_PROP_MODE",
"CV_CAP_PROP_BRIGHTNESS",
@ -1530,7 +1530,8 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
# finalize()
ci.j_code.write(
"""
protected void delete() {
@Override
protected void finalize() throws Throwable {
delete(nativeObj);
}
""" )