From 949ec486c56058bbf818e6307e1a61a2cbc1ccbf Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 9 Oct 2017 17:54:51 +0300 Subject: [PATCH 1/2] experimental version++ --- modules/dnn/include/opencv2/dnn/dnn.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dnn/include/opencv2/dnn/dnn.hpp b/modules/dnn/include/opencv2/dnn/dnn.hpp index cb015d4eba..d935e7e50d 100644 --- a/modules/dnn/include/opencv2/dnn/dnn.hpp +++ b/modules/dnn/include/opencv2/dnn/dnn.hpp @@ -46,9 +46,9 @@ #include #if !defined CV_DOXYGEN && !defined CV_DNN_DONT_ADD_EXPERIMENTAL_NS -#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_v1 { +#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_v2 { #define CV__DNN_EXPERIMENTAL_NS_END } -namespace cv { namespace dnn { namespace experimental_dnn_v1 { } using namespace experimental_dnn_v1; }} +namespace cv { namespace dnn { namespace experimental_dnn_v2 { } using namespace experimental_dnn_v2; }} #else #define CV__DNN_EXPERIMENTAL_NS_BEGIN #define CV__DNN_EXPERIMENTAL_NS_END From bd6fb497bc4e7629c577b9a5b07dff355c424073 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 9 Oct 2017 14:22:38 +0300 Subject: [PATCH 2/2] OpenCV version++ OpenCV 3.3.1 --- doc/tutorials/dnn/dnn_android/dnn_android.markdown | 4 ++-- .../cross_referencing/tutorial_cross_referencing.markdown | 2 +- modules/core/include/opencv2/core/version.hpp | 4 ++-- 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 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/tutorials/dnn/dnn_android/dnn_android.markdown b/doc/tutorials/dnn/dnn_android/dnn_android.markdown index 34a79dbcc8..b7ecf9ca27 100644 --- a/doc/tutorials/dnn/dnn_android/dnn_android.markdown +++ b/doc/tutorials/dnn/dnn_android/dnn_android.markdown @@ -6,13 +6,13 @@ using OpenCV deep learning module. Tutorial was written for the following versions of corresponding software: - Android Studio 2.3.3 -- OpenCV 3.3.0 +- OpenCV 3.3.0+ ## Requirements - 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. At this moment it's an `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.3.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 acc788d84e..b70555e6b8 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.0 + ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.3.1 @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 ca46377978..3847da24bc 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -52,8 +52,8 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 3 -#define CV_VERSION_REVISION 0 -#define CV_VERSION_STATUS "-dev" +#define CV_VERSION_REVISION 1 +#define CV_VERSION_STATUS "" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index a96ee845e5..416ef3b448 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.0", os.path.join(self.libdest, "lib"))]: + for ver, d in self.extra_packs + [("3.3.1", 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 7a52ecc977..f3b0dcfb1d 100644 --- a/platforms/android/service/engine/AndroidManifest.xml +++ b/platforms/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="331@ANDROID_PLATFORM_ID@" + android:versionName="3.31"> 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 5283cc2bc9..c45b44fa8b 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 = 3300; + int version = 3310; 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 88ee35e2b9..05739a660c 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.0-dev_Manager_3.30_armeabi-v7a.apk +Example: OpenCV_3.3.1-dev_Manager_3.30_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 3d6657417c..4449d97c59 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.0 + 3.3.1 org.opencv opencv-it diff --git a/platforms/maven/opencv/pom.xml b/platforms/maven/opencv/pom.xml index e08af40551..b66d7a5e17 100644 --- a/platforms/maven/opencv/pom.xml +++ b/platforms/maven/opencv/pom.xml @@ -4,7 +4,7 @@ org.opencv opencv-parent - 3.3.0 + 3.3.1 org.opencv opencv diff --git a/platforms/maven/pom.xml b/platforms/maven/pom.xml index 58c55127eb..6b34a473f4 100644 --- a/platforms/maven/pom.xml +++ b/platforms/maven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opencv opencv-parent - 3.3.0 + 3.3.1 pom OpenCV Parent POM