generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4031 from apavlenko:revert_4014

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-05-21 12:31:48 +00:00
commit 7061bf0000
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/misc/java/src/java/core+Mat.java
View File

@ -640,7 +640,6 @@ public class Mat {
{
n_release(nativeObj);
n_delete(nativeObj);
return;
}
@ -907,6 +906,12 @@ public class Mat {
return retVal;
}
@Override
protected void finalize() throws Throwable {
n_delete(nativeObj);
super.finalize();
}
// javadoc:Mat::toString()
@Override
public String toString() {

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(
"""
public void delete() {
@Override
protected void finalize() throws Throwable {
delete(nativeObj);
}
""" )