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

OpenCV Manager version++.

Browse Source
This commit is contained in:
Alexander Smorkalov
2014-09-30 12:05:46 +04:00
parent 45a1063c4a
commit a0431acb37
6 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platforms/android/service/doc/JavaHelper.rst
View File

@@ -67,3 +67,11 @@ OpenCV version constants
.. data:: OPENCV_VERSION_2_4_8
OpenCV Library version 2.4.8
.. data:: OPENCV_VERSION_2_4_9
OpenCV Library version 2.4.9
.. data:: OPENCV_VERSION_2_4_10
OpenCV Library version 2.4.10

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="218@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName="2.18" >
android:versionCode="219@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName="2.19" >
<uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

2
platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
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};
const int OpenCVEngine::KnownVersions[] = {2040000, 2040100, 2040200, 2040300, 2040301, 2040302, 2040400, 2040500, 2040600, 2040700, 2040701, 2040800, 2040900, 2041000};
bool OpenCVEngine::ValidateVersion(int version)
{