Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-15 07:29:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

OpenCV version++

Browse Source 
OpenCV 3.4.2
This commit is contained in:
Alexander Alekhin
2018-05-31 16:00:53 +03:00
committed by Maksim Shabunin
parent ab11b17d4b
commit d69a327d6d
10 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/android/build_sdk.py
View File

@@ -206,7 +206,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.4.1", os.path.join(self.libdest, "lib"))]:
for ver, d in self.extra_packs + [("3.4.2", 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="341@ANDROID_PLATFORM_ID@"
android:versionName="3.41">
android:versionCode="342@ANDROID_PLATFORM_ID@"
android:versionName="3.42">
<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

@@ -137,7 +137,7 @@ public class OpenCVEngineService extends Service {
@Override
public int getEngineVersion() throws RemoteException {
int version = 3410;
int version = 3420;
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.4.1-dev_Manager_3.41_armeabi-v7a.apk
Example: OpenCV_3.4.2-dev_Manager_3.42_armeabi-v7a.apk
Use the list of platforms below to determine proper OpenCV Manager package for your device: