mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenCV version++

Browse Source 
OpenCV 3.3.0
This commit is contained in:
Alexander Alekhin 2017-08-03 23:05:15 +00:00
parent 953160ddd6
commit 4af3ca4e4d
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 3
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-rc"
#define CV_VERSION_STATUS ""
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)

2
platforms/android/build_sdk.py
View File

@ -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.2.0", os.path.join(self.libdest, "lib"))]:
for ver, d in self.extra_packs + [("3.3.0", os.path.join(self.libdest, "lib"))]:
r = ET.Element("library", attrib={"version": ver})
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"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.engine"
android:versionCode="320@ANDROID_PLATFORM_ID@"
android:versionName="3.20">
android:versionCode="330@ANDROID_PLATFORM_ID@"
android:versionName="3.30">
<uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" android:targetSdkVersion="22"/>
<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
public int getEngineVersion() throws RemoteException {
int version = 3200;
int version = 3300;
try {
version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
} catch (NameNotFoundException e) {

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

@ -12,7 +12,7 @@ manually using adb tool:
adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk
Example: OpenCV_3.2.0-dev_Manager_3.20_armeabi-v7a.apk
Example: OpenCV_3.3.0-dev_Manager_3.30_armeabi-v7a.apk
Use the list of platforms below to determine proper OpenCV Manager package for your device: