From 94e4498cfd04373509af4eb6e66e144fa80ab4c2 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 18 Dec 2015 16:08:05 +0300 Subject: [PATCH 1/5] Version for 3.1.0 release --- modules/core/include/opencv2/core/version.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index 4a46f7930e..cf1442b5a4 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 0 +#define CV_VERSION_MINOR 1 #define CV_VERSION_REVISION 0 -#define CV_VERSION_STATUS "-dev" +#define CV_VERSION_STATUS "" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) From 2f4b334ef29e4e00c8c95cb76ab8d065ed2c3c29 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 18 Dec 2015 17:23:17 +0300 Subject: [PATCH 2/5] fix MSVS2010 builds --- cmake/OpenCVCRTLinkage.cmake | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/cmake/OpenCVCRTLinkage.cmake b/cmake/OpenCVCRTLinkage.cmake index 98da02dd7c..f5509d83f3 100644 --- a/cmake/OpenCVCRTLinkage.cmake +++ b/cmake/OpenCVCRTLinkage.cmake @@ -2,15 +2,14 @@ if(NOT MSVC) message(FATAL_ERROR "CRT options are available only for MSVC") endif() -#if (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore" OR ${CMAKE_SYSTEM_NAME} MATCHES "WindowsPhone") -# set(WINRT TRUE) - -if (WINRT AND CMAKE_SYSTEM_VERSION MATCHES 10) - add_definitions(/DWINVER=_WIN32_WINNT_WIN10 /DNTDDI_VERSION=NTDDI_WIN10 /D_WIN32_WINNT=_WIN32_WINNT_WIN10) -elseif(WINRT AND CMAKE_SYSTEM_VERSION MATCHES 8.1) - add_definitions(/DWINVER=_WIN32_WINNT_WINBLUE /DNTDDI_VERSION=NTDDI_WINBLUE /D_WIN32_WINNT=_WIN32_WINNT_WINBLUE) -else() - add_definitions(/DWINVER=_WIN32_WINNT_WIN8 /DNTDDI_VERSION=NTDDI_WIN8 /D_WIN32_WINNT=_WIN32_WINNT_WIN8) +if (WINRT) + if (CMAKE_SYSTEM_VERSION MATCHES 10) + add_definitions(/DWINVER=_WIN32_WINNT_WIN10 /DNTDDI_VERSION=NTDDI_WIN10 /D_WIN32_WINNT=_WIN32_WINNT_WIN10) + elseif(CMAKE_SYSTEM_VERSION MATCHES 8.1) + add_definitions(/DWINVER=_WIN32_WINNT_WINBLUE /DNTDDI_VERSION=NTDDI_WINBLUE /D_WIN32_WINNT=_WIN32_WINNT_WINBLUE) + else() + add_definitions(/DWINVER=_WIN32_WINNT_WIN8 /DNTDDI_VERSION=NTDDI_WIN8 /D_WIN32_WINNT=_WIN32_WINNT_WIN8) + endif() endif() # Removing LNK4075 warnings for debug WinRT builds From 4e669f59a0c6c2c2c05ca81ae1613da3050f4d35 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 18 Dec 2015 17:38:04 +0300 Subject: [PATCH 3/5] fix android pack --- platforms/android/build_sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index 274c02d9fa..5321aef750 100755 --- a/platforms/android/build_sdk.py +++ b/platforms/android/build_sdk.py @@ -57,7 +57,7 @@ def determine_opencv_version(version_hpp_path): major = re.search(r'^#define\W+CV_VERSION_MAJOR\W+(\d+)$', data, re.MULTILINE).group(1) minor = re.search(r'^#define\W+CV_VERSION_MINOR\W+(\d+)$', data, re.MULTILINE).group(1) revision = re.search(r'^#define\W+CV_VERSION_REVISION\W+(\d+)$', data, re.MULTILINE).group(1) - version_status = re.search(r'^#define\W+CV_VERSION_STATUS\W+"([^"]*)"', data, re.MULTILINE).group(1) + version_status = re.search(r'^#define\W+CV_VERSION_STATUS\W+"([^"]*)"$', data, re.MULTILINE).group(1) return "%(major)s.%(minor)s.%(revision)s%(version_status)s" % locals() #=================================================================================================== From 8d1f5b549022b44ef38453da688e8857faa924a1 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 18 Dec 2015 17:57:07 +0300 Subject: [PATCH 4/5] Version++ for android --- .../generator/src/java/android+OpenCVLoader.java | 5 +++++ platforms/android/build_sdk.py | 2 +- .../android/service/engine/AndroidManifest.xml | 4 ++-- .../org/opencv/engine/OpenCVEngineService.java | 2 +- platforms/android/service/readme.txt | 16 ++++++++-------- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/java/generator/src/java/android+OpenCVLoader.java b/modules/java/generator/src/java/android+OpenCVLoader.java index 339ea2d9d7..9c0db37fe9 100644 --- a/modules/java/generator/src/java/android+OpenCVLoader.java +++ b/modules/java/generator/src/java/android+OpenCVLoader.java @@ -62,6 +62,11 @@ public class OpenCVLoader */ public static final String OPENCV_VERSION_3_0_0 = "3.0.0"; + /** + * OpenCV Library version 3.1.0. + */ + public static final String OPENCV_VERSION_3_0_0 = "3.1.0"; + /** * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java"). diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index 5321aef750..f262a45467 100755 --- a/platforms/android/build_sdk.py +++ b/platforms/android/build_sdk.py @@ -166,7 +166,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.0.0", os.path.join(self.libdest, "lib"))]: + for ver, d in self.extra_packs + [("3.1.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 992f5f048a..ef1cab2a0e 100644 --- a/platforms/android/service/engine/AndroidManifest.xml +++ b/platforms/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="310@ANDROID_PLATFORM_ID@" + android:versionName="3.10"> 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 eccc36c9d2..917a64111e 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 = 3000; + int version = 3100; 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 5bd773b0e6..82cac62553 100644 --- a/platforms/android/service/readme.txt +++ b/platforms/android/service/readme.txt @@ -10,14 +10,14 @@ from Google Play. If Google Play is not available (i.e. on emulator, developer board, etc), you can install it manually using adb tool: - adb install /apk/OpenCV_3.0.0_Manager_3.00_.apk + adb install /apk/OpenCV_3.1.0_Manager_3.10_.apk Use the list below to determine proper OpenCV Manager package for your device: -- OpenCV_3.0.0-dev_Manager_3.00_armeabi.apk - armeabi (ARMv5, ARMv6) -- OpenCV_3.0.0-dev_Manager_3.00_armeabi-v7a.apk - armeabi-v7a (ARMv7-A + NEON) -- OpenCV_3.0.0-dev_Manager_3.00_arm64-v8a.apk - arm64-v8a (ARM64-v8a) -- OpenCV_3.0.0-dev_Manager_3.00_mips.apk - mips (MIPS) -- OpenCV_3.0.0-dev_Manager_3.00_mips64.apk - mips64 (MIPS64) -- OpenCV_3.0.0-dev_Manager_3.00_x86.apk - x86 -- OpenCV_3.0.0-dev_Manager_3.00_x86_64.apk - x86_64 +- OpenCV_3.1.0-dev_Manager_3.10_armeabi.apk - armeabi (ARMv5, ARMv6) +- OpenCV_3.1.0-dev_Manager_3.10_armeabi-v7a.apk - armeabi-v7a (ARMv7-A + NEON) +- OpenCV_3.1.0-dev_Manager_3.10_arm64-v8a.apk - arm64-v8a (ARM64-v8a) +- OpenCV_3.1.0-dev_Manager_3.10_mips.apk - mips (MIPS) +- OpenCV_3.1.0-dev_Manager_3.10_mips64.apk - mips64 (MIPS64) +- OpenCV_3.1.0-dev_Manager_3.10_x86.apk - x86 +- OpenCV_3.1.0-dev_Manager_3.10_x86_64.apk - x86_64 From 92387b1ef8fad15196dd5f7fb4931444a68bc93a Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 18 Dec 2015 18:02:16 +0300 Subject: [PATCH 5/5] Fix java version++ --- modules/java/generator/src/java/android+OpenCVLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/java/generator/src/java/android+OpenCVLoader.java b/modules/java/generator/src/java/android+OpenCVLoader.java index 9c0db37fe9..b8a9705923 100644 --- a/modules/java/generator/src/java/android+OpenCVLoader.java +++ b/modules/java/generator/src/java/android+OpenCVLoader.java @@ -65,7 +65,7 @@ public class OpenCVLoader /** * OpenCV Library version 3.1.0. */ - public static final String OPENCV_VERSION_3_0_0 = "3.1.0"; + public static final String OPENCV_VERSION_3_1_0 = "3.1.0"; /**