generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag '3.1.0'

Browse Source 
OpenCV 3.1.0
This commit is contained in:
Alexander Alekhin 2015-12-21 14:24:46 +03:00
commit 4cfe2b4dea
7 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/OpenCVCRTLinkage.cmake
View File

@ -2,15 +2,14 @@ if(NOT MSVC)
message(FATAL_ERROR "CRT options are available only for MSVC") message(FATAL_ERROR "CRT options are available only for MSVC")
endif() endif()
#if (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore" OR ${CMAKE_SYSTEM_NAME} MATCHES "WindowsPhone") if (WINRT)
# set(WINRT TRUE) if (CMAKE_SYSTEM_VERSION MATCHES 10)
add_definitions(/DWINVER=_WIN32_WINNT_WIN10 /DNTDDI_VERSION=NTDDI_WIN10 /D_WIN32_WINNT=_WIN32_WINNT_WIN10)
if (WINRT AND CMAKE_SYSTEM_VERSION MATCHES 10) elseif(CMAKE_SYSTEM_VERSION MATCHES 8.1)
add_definitions(/DWINVER=_WIN32_WINNT_WIN10 /DNTDDI_VERSION=NTDDI_WIN10 /D_WIN32_WINNT=_WIN32_WINNT_WIN10) add_definitions(/DWINVER=_WIN32_WINNT_WINBLUE /DNTDDI_VERSION=NTDDI_WINBLUE /D_WIN32_WINNT=_WIN32_WINNT_WINBLUE)
elseif(WINRT AND CMAKE_SYSTEM_VERSION MATCHES 8.1) else()
add_definitions(/DWINVER=_WIN32_WINNT_WINBLUE /DNTDDI_VERSION=NTDDI_WINBLUE /D_WIN32_WINNT=_WIN32_WINNT_WINBLUE) add_definitions(/DWINVER=_WIN32_WINNT_WIN8 /DNTDDI_VERSION=NTDDI_WIN8 /D_WIN32_WINNT=_WIN32_WINNT_WIN8)
else() endif()
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 # Removing LNK4075 warnings for debug WinRT builds

2
modules/core/include/opencv2/core/version.hpp
View File

@ -51,7 +51,7 @@
#define __OPENCV_VERSION_HPP__ #define __OPENCV_VERSION_HPP__
#define CV_VERSION_MAJOR 3 #define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 0 #define CV_VERSION_MINOR 1
#define CV_VERSION_REVISION 0 #define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-dev" #define CV_VERSION_STATUS "-dev"

5
modules/java/generator/src/java/android+OpenCVLoader.java
View File

@ -62,6 +62,11 @@ public class OpenCVLoader
*/ */
public static final String OPENCV_VERSION_3_0_0 = "3.0.0"; 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_1_0 = "3.1.0";
/** /**
* Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java"). * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").

4
platforms/android/build_sdk.py
View File

@ -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) 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) 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) 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() return "%(major)s.%(minor)s.%(revision)s%(version_status)s" % locals()
#=================================================================================================== #===================================================================================================
@ -166,7 +166,7 @@ class Builder:
# Add extra data # Add extra data
apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True) apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True)
apklibdest = check_dir(os.path.join(apkdest, "libs", abi.name), 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}) r = ET.Element("library", attrib={"version": ver})
log.info("Adding libraries from %s", d) log.info("Adding libraries from %s", d)

4
platforms/android/service/engine/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.engine" package="org.opencv.engine"
android:versionCode="300@ANDROID_PLATFORM_ID@" android:versionCode="310@ANDROID_PLATFORM_ID@"
android:versionName="3.00"> android:versionName="3.10">
<uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" android:targetSdkVersion="22"/>
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

2
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
View File

@ -134,7 +134,7 @@ public class OpenCVEngineService extends Service {
@Override @Override
public int getEngineVersion() throws RemoteException { public int getEngineVersion() throws RemoteException {
int version = 3000; int version = 3100;
try { try {
version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode; version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {

16
platforms/android/service/readme.txt
View File

@ -10,14 +10,14 @@ from Google Play.
If Google Play is not available (i.e. on emulator, developer board, etc), you can install it If Google Play is not available (i.e. on emulator, developer board, etc), you can install it
manually using adb tool: manually using adb tool:
adb install <path-to-OpenCV-sdk>/apk/OpenCV_3.0.0_Manager_3.00_<platform>.apk adb install <path-to-OpenCV-sdk>/apk/OpenCV_3.1.0_Manager_3.10_<platform>.apk
Use the list below to determine proper OpenCV Manager package for your device: 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.1.0-dev_Manager_3.10_armeabi.apk - armeabi (ARMv5, ARMv6)
- OpenCV_3.0.0-dev_Manager_3.00_armeabi-v7a.apk - armeabi-v7a (ARMv7-A + NEON) - OpenCV_3.1.0-dev_Manager_3.10_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.1.0-dev_Manager_3.10_arm64-v8a.apk - arm64-v8a (ARM64-v8a)
- OpenCV_3.0.0-dev_Manager_3.00_mips.apk - mips (MIPS) - OpenCV_3.1.0-dev_Manager_3.10_mips.apk - mips (MIPS)
- OpenCV_3.0.0-dev_Manager_3.00_mips64.apk - mips64 (MIPS64) - OpenCV_3.1.0-dev_Manager_3.10_mips64.apk - mips64 (MIPS64)
- OpenCV_3.0.0-dev_Manager_3.00_x86.apk - x86 - OpenCV_3.1.0-dev_Manager_3.10_x86.apk - x86
- OpenCV_3.0.0-dev_Manager_3.00_x86_64.apk - x86_64 - OpenCV_3.1.0-dev_Manager_3.10_x86_64.apk - x86_64