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

diff --git a/modules/core/misc/java/src/java/core+Mat.java b/modules/core/misc/java/src/java/core+Mat.java
index 4fd60a7..6db2554 100644 (file)
--- a/modules/core/misc/java/src/java/core+Mat.java
+++ b/modules/core/misc/java/src/java/core+Mat.java
@@ -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() {

diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py
index eccc541..cbc2848 100755 (executable)
--- a/modules/java/generator/gen_java.py
+++ b/modules/java/generator/gen_java.py
@@ -1530,7 +1530,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
             # finalize()
             ci.j_code.write(
 """
-    public void delete() {
+    protected void delete() {
         delete(nativeObj);
     }
 """ )