Fixed build of camera calibration android sample

diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt
index c0b626d9b18b66124a4bdc25e9fe354b01bf845d..0dc4a3cd69c7162c1e78a6fafa3a55b0505cb70d 100644 (file)
--- a/samples/android/CMakeLists.txt
+++ b/samples/android/CMakeLists.txt
@@ -9,6 +9,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wmissing-declarations)
 add_subdirectory(15-puzzle)
 add_subdirectory(face-detection)
 add_subdirectory(image-manipulations)
+add_subdirectory(camera-calibration)
 add_subdirectory(color-blob-detection)
 add_subdirectory(tutorial-1-camerapreview)
 add_subdirectory(tutorial-2-mixedprocessing)

diff --git a/samples/android/camera-calibration/AndroidManifest.xml b/samples/android/camera-calibration/AndroidManifest.xml
index d47576abec0898fb347736ac92fde547c232e6d5..5f2dad73c41f6ac07cf0112251e8b022118774cd 100644 (file)
--- a/samples/android/camera-calibration/AndroidManifest.xml
+++ b/samples/android/camera-calibration/AndroidManifest.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"\r
-         package="org.opencv.samples.cameracalibration"\r
-         android:versionCode="1"\r
-         android:versionName="1.0" >\r
-\r
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.opencv.samples.cameracalibration"
+          android:versionCode="1"
+          android:versionName="1.0">
+
     <application
-        android:label="@string/app_name"\r
-        android:icon="@drawable/icon"\r
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
-        \r
-        <activity android:name="CameraCalibrationActivity"\r
-                 android:label="@string/app_name"
+        android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+
+        <activity android:name="CameraCalibrationActivity"
+                  android:label="@string/app_name"
                   android:screenOrientation="landscape"
-                  android:configChanges="keyboardHidden|orientation" >\r
-            <intent-filter>\r
-                <action android:name="android.intent.action.MAIN" />\r
-                <category android:name="android.intent.category.LAUNCHER" />\r
-            </intent-filter>\r
-        </activity>\r
+                  android:configChanges="keyboardHidden|orientation">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
     
     <supports-screens android:resizeable="true"
@@ -26,13 +26,13 @@
                       android:largeScreens="true"
                       android:anyDensity="true" />
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="11" />
+    <uses-sdk android:minSdkVersion="8" />
 
     <uses-permission android:name="android.permission.CAMERA"/>
 
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
-    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>\r
-\r
-</manifest>\r
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
+
+</manifest>