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

OpenCV and OpenCV Manager version++

Browse Source
This commit is contained in:
Alexander Smorkalov
2015-02-20 13:46:54 +03:00
parent 65e4df751c
commit 96e5300fdd
7 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/android/service/doc/JavaHelper.rst
+4
View File
@@ -75,3 +75,7 @@ OpenCV version constants
.. data:: OPENCV_VERSION_2_4_10
OpenCV Library version 2.4.10
.. data:: OPENCV_VERSION_2_4_11
OpenCV Library version 2.4.11
platforms/android/service/engine/AndroidManifest.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.engine"
android:versionCode="219@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName="2.19" >
android:versionName="2.20" >
<uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ using namespace android;
const int OpenCVEngine::Platform = DetectKnownPlatforms();
const int OpenCVEngine::CpuID = GetCpuID();
const int OpenCVEngine::KnownVersions[] = {2040000, 2040100, 2040200, 2040300, 2040301, 2040302, 2040400, 2040500, 2040600, 2040700, 2040701, 2040800, 2040900, 2041000};
const int OpenCVEngine::KnownVersions[] = {2040000, 2040100, 2040200, 2040300, 2040301, 2040302, 2040400, 2040500, 2040600, 2040700, 2040701, 2040800, 2040900, 2041000, 2041100};
bool OpenCVEngine::ValidateVersion(int version)
{