mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770)

Browse Source
This commit is contained in:
Andrey Pavlenko 2015-05-19 13:28:32 +03:00
parent 3136010e1a
commit d67d32af48
2 changed files with 7 additions and 2 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_release(nativeObj);
n_delete(nativeObj);
return; return;
} }
@ -907,6 +906,12 @@ public class Mat {
return retVal; return retVal;
} }
@Override
protected void finalize() throws Throwable {
n_delete(nativeObj);
super.finalize();
}
// javadoc:Mat::toString() // javadoc:Mat::toString()
@Override @Override
public String toString() { public String toString() {

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

@ -1530,7 +1530,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
# finalize() # finalize()
ci.j_code.write( ci.j_code.write(
""" """
public void delete() { protected void delete() {
delete(nativeObj); delete(nativeObj);
} }
""" ) """ )