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

Merge pull request #121 from branch asmorkalov:android_samples_fix

Browse Source
This commit is contained in:
marina.kolpakova
2012-11-01 19:08:32 +04:00
parent 57fc5e00f3 a1a2cb0aeb
commit 9b92de9a88
17 changed files with 126 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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="18"
android:versionName="1.8" >
android:versionCode="20"
android:versionName="2.0" >
<uses-sdk android:minSdkVersion="8" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
android/service/engine/jni/include/EngineCommon.h
+1 -1
View File
@@ -6,7 +6,7 @@
#define LOG_TAG "OpenCVEngine"
#ifndef OPEN_CV_ENGINE_VERSION
#define OPEN_CV_ENGINE_VERSION 1
#define OPEN_CV_ENGINE_VERSION 2
#endif
#define LIB_OPENCV_INFO_NAME "libopencv_info.so"