Merge pull request opencv#4014 from sgjava:opencv-sgjava

mshabunin · May 14, 2015 · 52fa55a · 52fa55a
2 parents a87e1c2 + 8b3b2a5
commit 52fa55a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/modules/core/misc/java/src/java/core+Mat.java b/modules/core/misc/java/src/java/core+Mat.java
@@ -640,6 +640,7 @@ public void release()
     {
 
         n_release(nativeObj);
+        n_delete(nativeObj);
 
         return;
     }
@@ -906,12 +907,6 @@ public static Mat zeros(Size size, int type)
         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
@@ -1530,7 +1530,7 @@ def gen_class(self, ci):
             # finalize()
             ci.j_code.write(
 """
-    protected void delete() {
+    public void delete() {
         delete(nativeObj);
     }
 """ )