From 3df6548c4a17f02e950f45d37c6cb10fb520d84c Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Wed, 29 Jun 2011 13:42:46 +0000
Subject: [PATCH] Android samples fixed - line endings are converted to unix
 style; autogenerated folders are added to ignore list

---
 modules/java/android/.project                | 66 ++++++++++++++--------------
 modules/java/android/AndroidManifest.xml     | 30 ++++++-------
 samples/android/0-base/AndroidManifest.xml   | 58 ++++++++++++------------
 samples/android/1-java/AndroidManifest.xml   | 58 ++++++++++++------------
 samples/android/2-native/AndroidManifest.xml | 58 ++++++++++++------------
 samples/android/4-mixed/AndroidManifest.xml  | 58 ++++++++++++------------
 6 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/modules/java/android/.project b/modules/java/android/.project
index b875675..37ed81a 100644
--- a/modules/java/android/.project
+++ b/modules/java/android/.project
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>OpenCVJavaAPI</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>OpenCV</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/modules/java/android/AndroidManifest.xml b/modules/java/android/AndroidManifest.xml
index 664b68a..e0e8f36 100644
--- a/modules/java/android/AndroidManifest.xml
+++ b/modules/java/android/AndroidManifest.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.JavaAPI"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:label="OpenCVJavaAPI">
-        <activity android:name="OpenCVJavaAPI"
-                  android:label="OpenCVJavaAPI">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest> 
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.opencv"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:label="OpenCV">
+        <activity android:name="OpenCV"
+                  android:label="OpenCV">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
diff --git a/samples/android/0-base/AndroidManifest.xml b/samples/android/0-base/AndroidManifest.xml
index 89b07c8..d2919b9 100644
--- a/samples/android/0-base/AndroidManifest.xml
+++ b/samples/android/0-base/AndroidManifest.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.s0"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true" 
-                      android:normalScreens="true" 
-                      android:largeScreens="true" 
-                      android:anyDensity="true" />
-
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
-        <activity android:name="Sample0Base"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    
-    <uses-sdk android:minSdkVersion="8" />
-
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-
-</manifest> 
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.opencv.samples.s0"
+      android:versionCode="1"
+      android:versionName="1.0">
+
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true" 
+                      android:normalScreens="true" 
+                      android:largeScreens="true" 
+                      android:anyDensity="true" />
+
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name="Sample0Base"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    
+    <uses-sdk android:minSdkVersion="8" />
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+</manifest> 
diff --git a/samples/android/1-java/AndroidManifest.xml b/samples/android/1-java/AndroidManifest.xml
index 90a127c..8742d3b 100644
--- a/samples/android/1-java/AndroidManifest.xml
+++ b/samples/android/1-java/AndroidManifest.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.s1"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true" 
-                      android:normalScreens="true" 
-                      android:largeScreens="true" 
-                      android:anyDensity="true" />
-
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
-        <activity android:name="Sample1Java"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    
-    <uses-sdk android:minSdkVersion="8" />
-
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-
-</manifest> 
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.opencv.samples.s1"
+      android:versionCode="1"
+      android:versionName="1.0">
+
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true" 
+                      android:normalScreens="true" 
+                      android:largeScreens="true" 
+                      android:anyDensity="true" />
+
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name="Sample1Java"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    
+    <uses-sdk android:minSdkVersion="8" />
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+</manifest> 
diff --git a/samples/android/2-native/AndroidManifest.xml b/samples/android/2-native/AndroidManifest.xml
index 0b5e6cf..117e3dd 100644
--- a/samples/android/2-native/AndroidManifest.xml
+++ b/samples/android/2-native/AndroidManifest.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.s2"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true" 
-                      android:normalScreens="true" 
-                      android:largeScreens="true" 
-                      android:anyDensity="true" />
-
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
-        <activity android:name="Sample2Native"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    
-    <uses-sdk android:minSdkVersion="8" />
-
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-
-</manifest> 
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.opencv.samples.s2"
+      android:versionCode="1"
+      android:versionName="1.0">
+
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true" 
+                      android:normalScreens="true" 
+                      android:largeScreens="true" 
+                      android:anyDensity="true" />
+
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name="Sample2Native"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    
+    <uses-sdk android:minSdkVersion="8" />
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+</manifest> 
diff --git a/samples/android/4-mixed/AndroidManifest.xml b/samples/android/4-mixed/AndroidManifest.xml
index d8e64d5..095e21b 100644
--- a/samples/android/4-mixed/AndroidManifest.xml
+++ b/samples/android/4-mixed/AndroidManifest.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.s4"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true" 
-                      android:normalScreens="true" 
-                      android:largeScreens="true" 
-                      android:anyDensity="true" />
-
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
-        <activity android:name="Sample4Mixed"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    
-    <uses-sdk android:minSdkVersion="8" />
-
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-
-</manifest> 
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.opencv.samples.s4"
+      android:versionCode="1"
+      android:versionName="1.0">
+
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true" 
+                      android:normalScreens="true" 
+                      android:largeScreens="true" 
+                      android:anyDensity="true" />
+
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name="Sample4Mixed"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    
+    <uses-sdk android:minSdkVersion="8" />
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+</manifest> 
-- 
2.7.4