Merge pull request #4014 from sgjava:opencv-sgjava

This commit is contained in:
Vadim Pisarevsky 2015-05-14 18:23:27 +00:00
commit 52fa55a770
2 changed files with 2 additions and 7 deletions

View File

@ -640,6 +640,7 @@ public class Mat {
{ {
n_release(nativeObj); n_release(nativeObj);
n_delete(nativeObj);
return; return;
} }
@ -906,12 +907,6 @@ 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() {

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(
""" """
protected void delete() { public void delete() {
delete(nativeObj); delete(nativeObj);
} }
""" ) """ )