From 76bcf72ded5fe7101fab2be507941e683ed18890 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 23 Oct 2012 19:49:00 +0400 Subject: [PATCH] 2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated. --- android/service/doc/BaseLoaderCallback.rst | 6 +++--- android/service/doc/JavaHelper.rst | 4 ++++ android/service/doc/LoaderCallbackInterface.rst | 2 +- android/service/engine/jni/BinderComponent/OpenCVEngine.cpp | 1 + modules/java/generator/src/java/android+OpenCVLoader.java | 5 +++++ .../src/org/opencv/samples/puzzle15/Puzzle15Activity.java | 2 +- .../samples/colorblobdetect/ColorBlobDetectionActivity.java | 2 +- .../src/org/opencv/samples/fd/FdActivity.java | 2 +- .../imagemanipulations/ImageManipulationsActivity.java | 2 +- .../src/org/opencv/samples/tutorial1/Sample1Java.java | 2 +- .../org/opencv/samples/tutorial2/Sample2NativeCamera.java | 2 +- .../src/org/opencv/samples/tutorial3/Sample3Native.java | 2 +- .../src/org/opencv/samples/tutorial4/Sample4Mixed.java | 2 +- 13 files changed, 22 insertions(+), 12 deletions(-) diff --git a/android/service/doc/BaseLoaderCallback.rst b/android/service/doc/BaseLoaderCallback.rst index f756db46b..d75003877 100644 --- a/android/service/doc/BaseLoaderCallback.rst +++ b/android/service/doc/BaseLoaderCallback.rst @@ -46,7 +46,7 @@ There is a very base code snippet implementing the async initialization with Bas super.onResume(); Log.i(TAG, "Trying to load OpenCV library"); - if (!OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mOpenCVCallBack)) + if (!OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); } @@ -55,6 +55,6 @@ There is a very base code snippet implementing the async initialization with Bas Using in Service ---------------- -Default BaseLoaderCallback implementation treat application context as Activity and calls Activity.finish() method to exit in case of initialization failure. -To override this behavior you need to override finish() method of BaseLoaderCallback class and implement your own finalization method. +Default BaseLoaderCallback implementation treat application context as Activity and calls Activity.finish() method to exit in case of initialization failure. +To override this behavior you need to override finish() method of BaseLoaderCallback class and implement your own finalization method. diff --git a/android/service/doc/JavaHelper.rst b/android/service/doc/JavaHelper.rst index f4f448390..102b727d7 100644 --- a/android/service/doc/JavaHelper.rst +++ b/android/service/doc/JavaHelper.rst @@ -40,6 +40,10 @@ OpenCV version constants OpenCV Library version 2.4.2 +.. data:: OPENCV_VERSION_2_4_3 + + OpenCV Library version 2.4.3 + Other constatnts ---------------- diff --git a/android/service/doc/LoaderCallbackInterface.rst b/android/service/doc/LoaderCallbackInterface.rst index 0549b5aeb..08bc16096 100644 --- a/android/service/doc/LoaderCallbackInterface.rst +++ b/android/service/doc/LoaderCallbackInterface.rst @@ -13,7 +13,7 @@ void onManagerConnected() .. method:: void onManagerConnected(int status) Callback method that is called after OpenCV Library initialization. - + :param status: status of initialization (see Initialization Status Constants). void onPackageInstall() diff --git a/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp b/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp index 2310aae21..6988714f5 100644 --- a/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp +++ b/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp @@ -23,6 +23,7 @@ std::set OpenCVEngine::InitKnownOpenCVersions() result.insert("240"); result.insert("241"); result.insert("242"); + result.insert("243"); return result; } diff --git a/modules/java/generator/src/java/android+OpenCVLoader.java b/modules/java/generator/src/java/android+OpenCVLoader.java index e754a995f..ce5f4b761 100644 --- a/modules/java/generator/src/java/android+OpenCVLoader.java +++ b/modules/java/generator/src/java/android+OpenCVLoader.java @@ -12,6 +12,11 @@ public class OpenCVLoader */ public static final String OPENCV_VERSION_2_4_2 = "2.4.2"; + /** + * OpenCV Library version 2.4.3. + */ + public static final String OPENCV_VERSION_2_4_3 = "2.4.3"; + /** * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java"). * @return Returns true is initialization of OpenCV was successful. diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java index e72dbbaee..cf2e53c3c 100644 --- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java +++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java @@ -71,7 +71,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener, public void onResume() { super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } public void onDestroy() { diff --git a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java index d772bb8aa..1555aca6c 100644 --- a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java +++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java @@ -86,7 +86,7 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe public void onResume() { super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } public void onDestroy() { diff --git a/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java b/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java index 7a2808cf5..e68989c68 100644 --- a/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java +++ b/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java @@ -140,7 +140,7 @@ public class FdActivity extends Activity implements CvCameraViewListener { public void onResume() { super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } public void onDestroy() { diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java index 19744f9ee..b26145c15 100644 --- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java +++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java @@ -121,7 +121,7 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView public void onResume() { super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } public void onDestroy() { diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java index e53b55ce1..0af6f5f79 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java @@ -64,7 +64,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener { public void onResume() { super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } public void onDestroy() { diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java index 0676d5bb2..ae6f43358 100644 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java +++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java @@ -83,7 +83,7 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene public void onResume() { super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } public void onDestroy() { diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java index 9e17793d1..498f0d377 100644 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java +++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java @@ -72,7 +72,7 @@ public class Sample3Native extends Activity implements CvCameraViewListener { public void onResume() { super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } public void onDestroy() { diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java index 2a3eb9973..fa61dc960 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java @@ -98,7 +98,7 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener { public void onResume() { super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); } public void onDestroy() {