From cac4a7e5b517b68792000399cf6698bcbb37e7b8 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sat, 16 Dec 2017 01:30:43 +0300 Subject: [PATCH] OpenCV version++ OpenCV 3.4.0-rc --- doc/tutorials/dnn/dnn_android/dnn_android.markdown | 2 +- .../cross_referencing/tutorial_cross_referencing.markdown | 2 +- modules/core/include/opencv2/core/version.hpp | 6 +++--- .../java/generator/src/java/android+OpenCVLoader.java.in | 5 +++++ platforms/android/build_sdk.py | 2 +- platforms/android/service/engine/AndroidManifest.xml | 4 ++-- .../engine/src/org/opencv/engine/OpenCVEngineService.java | 2 +- platforms/android/service/readme.txt | 2 +- platforms/maven/opencv-it/pom.xml | 2 +- platforms/maven/opencv/pom.xml | 2 +- platforms/maven/pom.xml | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/doc/tutorials/dnn/dnn_android/dnn_android.markdown b/doc/tutorials/dnn/dnn_android/dnn_android.markdown index b7ecf9ca27..5596bcc7fd 100644 --- a/doc/tutorials/dnn/dnn_android/dnn_android.markdown +++ b/doc/tutorials/dnn/dnn_android/dnn_android.markdown @@ -12,7 +12,7 @@ Tutorial was written for the following versions of corresponding software: - Download and install Android Studio from https://developer.android.com/studio. -- Get the latest pre-built OpenCV for Android release from https://github.com/opencv/opencv/releases and unpack it (for example, `opencv-3.3.0-android-sdk.zip`). +- Get the latest pre-built OpenCV for Android release from https://github.com/opencv/opencv/releases and unpack it (for example, `opencv-3.4.0-android-sdk.zip`). - Download MobileNet object detection model from https://github.com/chuanqi305/MobileNet-SSD. We need a configuration file `MobileNetSSD_deploy.prototxt` and weights `MobileNetSSD_deploy.caffemodel`. diff --git a/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown b/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown index b70555e6b8..18fab29b97 100644 --- a/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown +++ b/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown @@ -43,7 +43,7 @@ If you had other definitions already, you can append the line using a `\`: @code TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \ - ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.3.1 + ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.0 @endcode Doxygen can now use the information from the tag file to link to the OpenCV diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index 0a5bd53519..6179a75ab1 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -51,9 +51,9 @@ #define OPENCV_VERSION_HPP #define CV_VERSION_MAJOR 3 -#define CV_VERSION_MINOR 3 -#define CV_VERSION_REVISION 1 -#define CV_VERSION_STATUS "-dev" +#define CV_VERSION_MINOR 4 +#define CV_VERSION_REVISION 0 +#define CV_VERSION_STATUS "-rc" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) diff --git a/modules/java/generator/src/java/android+OpenCVLoader.java.in b/modules/java/generator/src/java/android+OpenCVLoader.java.in index 8f8cd05012..625c3daf27 100644 --- a/modules/java/generator/src/java/android+OpenCVLoader.java.in +++ b/modules/java/generator/src/java/android+OpenCVLoader.java.in @@ -87,6 +87,11 @@ public class OpenCVLoader */ public static final String OPENCV_VERSION_3_3_0 = "3.3.0"; + /** + * OpenCV Library version 3.4.0. + */ + public static final String OPENCV_VERSION_3_4_0 = "3.4.0"; + /** * Current OpenCV Library version */ diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index 416ef3b448..296feb59bf 100755 --- a/platforms/android/build_sdk.py +++ b/platforms/android/build_sdk.py @@ -171,7 +171,7 @@ class Builder: # Add extra data apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True) apklibdest = check_dir(os.path.join(apkdest, "libs", abi.name), create=True) - for ver, d in self.extra_packs + [("3.3.1", os.path.join(self.libdest, "lib"))]: + for ver, d in self.extra_packs + [("3.4.0", os.path.join(self.libdest, "lib"))]: r = ET.Element("library", attrib={"version": ver}) log.info("Adding libraries from %s", d) diff --git a/platforms/android/service/engine/AndroidManifest.xml b/platforms/android/service/engine/AndroidManifest.xml index f3b0dcfb1d..948eb66598 100644 --- a/platforms/android/service/engine/AndroidManifest.xml +++ b/platforms/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="340@ANDROID_PLATFORM_ID@" + android:versionName="3.40"> diff --git a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java index c45b44fa8b..f2a0a521f2 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java +++ b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java @@ -134,7 +134,7 @@ public class OpenCVEngineService extends Service { @Override public int getEngineVersion() throws RemoteException { - int version = 3310; + int version = 3400; try { version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode; } catch (NameNotFoundException e) { diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt index 05739a660c..8d062496f7 100644 --- a/platforms/android/service/readme.txt +++ b/platforms/android/service/readme.txt @@ -12,7 +12,7 @@ manually using adb tool: adb install /apk/OpenCV__Manager__.apk -Example: OpenCV_3.3.1-dev_Manager_3.30_armeabi-v7a.apk +Example: OpenCV_3.4.0-dev_Manager_3.40_armeabi-v7a.apk Use the list of platforms below to determine proper OpenCV Manager package for your device: diff --git a/platforms/maven/opencv-it/pom.xml b/platforms/maven/opencv-it/pom.xml index 4449d97c59..89e6e47da9 100644 --- a/platforms/maven/opencv-it/pom.xml +++ b/platforms/maven/opencv-it/pom.xml @@ -4,7 +4,7 @@ org.opencv opencv-parent - 3.3.1 + 3.4.0 org.opencv opencv-it diff --git a/platforms/maven/opencv/pom.xml b/platforms/maven/opencv/pom.xml index b66d7a5e17..b20b3fac58 100644 --- a/platforms/maven/opencv/pom.xml +++ b/platforms/maven/opencv/pom.xml @@ -4,7 +4,7 @@ org.opencv opencv-parent - 3.3.1 + 3.4.0 org.opencv opencv diff --git a/platforms/maven/pom.xml b/platforms/maven/pom.xml index 6b34a473f4..84fd0b8483 100644 --- a/platforms/maven/pom.xml +++ b/platforms/maven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opencv opencv-parent - 3.3.1 + 3.4.0 pom OpenCV Parent POM