Merge pull request #121 from branch asmorkalov:android_samples_fix

android/service/doc/build_uml.py

@@ -20,4 +20,4 @@ if (not os.path.exists(TARGET_PATH)):
 
 for filename in os.listdir("."):
     if ("dia" == filename[-3:]):
-    os.system("%s --export %s %s" % (DiaPath, os.path.join(TARGET_PATH, filename[0:len(filename)-4] + ".png"), filename))
+        os.system("%s --export %s %s" % (DiaPath, os.path.join(TARGET_PATH, filename[0:len(filename)-4] + ".png"), filename))

android/service/engine/AndroidManifest.xml

@@ -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

@@ -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"