Updated

sgjava · May 19, 2018 · cc9455e · cc9455e
1 parent e0ad7d9
commit cc9455e
Show file tree

Hide file tree

Showing 23 changed files with 13 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.project b/.project
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ which is currently 3.2.0:
 
 ### The current way to free native memory
 
-OpenCV 2.4 and 3.2 use a Python code generator
+OpenCV 2.4 through 4.0.0-pre use a Python code generator
 `modules/java/generator/gen_java.py` to generate Java bindings during the build
 process. The generated code to free native resources looks like:
 
@@ -286,6 +286,18 @@ to do things incorrectly.
 * [Opencv sgjava](https://github.com/Itseez/opencv/pull/4014)
 * [New Java memory mgt doc](https://github.com/Itseez/opencv/pull/4019)
 * [Added finalize back in](https://github.com/Itseez/opencv/pull/4029)
+* [Get rid of finalizers in Java bindings](https://github.com/opencv/opencv/issues/8683)
+
+#### Fix template
+* Edit `modules/java/generator/templates/java_class.prolog`
+* Find
+```
+public final long nativeObj;
+```
+* Change to
+```
+public long nativeObj;
+```
 
 #### Fix Mat
 * Edit `modules/core/misc/java/src/java/core+Mat.java`
@@ -307,14 +319,6 @@ public void free() {
     }
 }
 ```
-* Find
-```
-public final long nativeObj;
-```
-* Change to
-```
-public long nativeObj;
-```
 
 This will create a free() method that replaces finalize() thus you must make
 sure you call free() when you are done with the Mat. I also removed the final

diff --git a/build.xml b/build.xml
diff --git a/images/OpenCVFree_locks1.png b/images/OpenCVFree_locks1.png
diff --git a/images/OpenCVFree_locks2.png b/images/OpenCVFree_locks2.png
diff --git a/images/OpenCVFree_no_gc1.png b/images/OpenCVFree_no_gc1.png
diff --git a/images/OpenCVNewMat_gc1.png b/images/OpenCVNewMat_gc1.png
diff --git a/images/OpenCVNewMat_no_gc1.png b/images/OpenCVNewMat_no_gc1.png
diff --git a/images/OpenCVRelease_locks1.png b/images/OpenCVRelease_locks1.png
diff --git a/images/OpenCVRelease_locks2.png b/images/OpenCVRelease_locks2.png
diff --git a/images/OpenCVRelease_no_gc1.png b/images/OpenCVRelease_no_gc1.png
diff --git a/images/OpenCVRelease_no_gc2.png b/images/OpenCVRelease_no_gc2.png
diff --git a/images/title.png b/images/title.png
diff --git a/manifest.mf b/manifest.mf
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
diff --git a/nbproject/project.properties b/nbproject/project.properties
diff --git a/nbproject/project.xml b/nbproject/project.xml
diff --git a/src/com/codeferm/opencv/OpenCVFindContours.java b/src/com/codeferm/opencv/OpenCVFindContours.java
diff --git a/src/com/codeferm/opencv/OpenCVFree.java b/src/com/codeferm/opencv/OpenCVFree.java
diff --git a/src/com/codeferm/opencv/OpenCVNewMat.java b/src/com/codeferm/opencv/OpenCVNewMat.java
diff --git a/src/com/codeferm/opencv/OpenCVRelease.java b/src/com/codeferm/opencv/OpenCVRelease.java