potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge branch '3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-12-22 05:40:15 +00:00
parent 578ea4bae9 c0e11bb50e
commit 1dee705074
29 changed files with 995 additions and 1879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/android/service/engine/AndroidManifest.xml
+2 -2
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="344@ANDROID_PLATFORM_ID@"
android:versionName="3.44">
android:versionCode="345@ANDROID_PLATFORM_ID@"
android:versionName="3.45">
<uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" android:targetSdkVersion="22"/>
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
+1 -1
View File
@@ -137,7 +137,7 @@ public class OpenCVEngineService extends Service {
@Override
public int getEngineVersion() throws RemoteException {
int version = 3440;
int version = 3450;
try {
version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
} catch (NameNotFoundException e) {
platforms/android/service/readme.txt
+1 -1
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.4-dev_Manager_3.44_armeabi-v7a.apk
Example: OpenCV_3.4.5-dev_Manager_3.45_armeabi-v7a.apk
Use the list of platforms below to determine proper OpenCV Manager package for your device: