From d67d32af482441616c622c1683d7c582fe06cd9c Mon Sep 17 00:00:00 2001
From: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue, 19 May 2015 13:28:32 +0300
Subject: [PATCH 1/2] Revert of "Merge pull request #4014 from
 sgjava:opencv-sgjava" (reverted from commit
 52fa55a770cb07a6401aa6617b81f413d1165771)

---
 modules/core/misc/java/src/java/core+Mat.java | 7 ++++++-
 modules/java/generator/gen_java.py            | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/core/misc/java/src/java/core+Mat.java b/modules/core/misc/java/src/java/core+Mat.java
index 4fd60a79c6..6db255417c 100644
--- 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 eccc541508..cbc28484a5 100755
--- 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);
     }
 """ )

From ab8afc3bccffe319541fbb615733e946de058083 Mon Sep 17 00:00:00 2001
From: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Tue, 19 May 2015 18:52:59 +0300
Subject: [PATCH 2/2] Revert of "Merge pull request #4006 from
 sgjava:opencv-steve" (reverted from commit
 4743184078659d4bcf43c363efd2aa430e4786ff)

---
 modules/java/generator/gen_java.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py
index cbc28484a5..b9fce4294b 100755
--- a/modules/java/generator/gen_java.py
+++ b/modules/java/generator/gen_java.py
@@ -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(
 """
-    protected void delete() {
+    @Override
+    protected void finalize() throws Throwable {
         delete(nativeObj);
     }
 """ )