Android samples are renamed
Andrey Kamaev
@ -79,7 +79,7 @@ do
|
||||
fi
|
||||
done
|
||||
|
||||
echo "OPENCV_MK_PATH:=../../opencv$CV_VERSION/share/OpenCV/OpenCV.mk" > includeOpenCV.mk
|
||||
echo "OPENCV_MK_PATH:=../../$OPENCV_NAME/share/OpenCV/OpenCV.mk" > includeOpenCV.mk
|
||||
|
||||
|
||||
#clean samples
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>opencv2.3.1</name>
|
||||
<name>OpenCV-2.3.1</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
package="org.opencv"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
<application android:label="opencv2.3.1">
|
||||
<activity android:name="opencv2.3.1"
|
||||
android:label="opencv2.3.1">
|
||||
<application android:label="OpenCV-2.3.1">
|
||||
<activity android:name="OpenCV-2.3.1"
|
||||
android:label="OpenCV-2.3.1">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Sample 0: base</string>
|
||||
</resources>
|
||||
@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Sample 1: Java API</string>
|
||||
</resources>
|
||||
@ -40,7 +40,7 @@ if (BUILD_ANDROID_EXAMPLES)
|
||||
|
||||
file(RELATIVE_PATH OPENCV_REFERENCE_PATH "${sample_dir}" "${CMAKE_BINARY_DIR}")
|
||||
|
||||
if(NOT ("${sample}" STREQUAL "0-base" OR "${sample}" STREQUAL "2-native"))
|
||||
if(NOT ("${sample}" MATCHES "tutorial-[03].*"))
|
||||
SET(opencv_reference --library \"${OPENCV_REFERENCE_PATH}\")
|
||||
else()
|
||||
SET(opencv_reference)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>Sample 0 base</name>
|
||||
<name>Tutorial 1 Basic - 0. Android Camera</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.opencv.samples.s0"
|
||||
package="org.opencv.samples.tutorial0"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
|
||||
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Tutorial 1 Basic - 0. Android Camera</string>
|
||||
</resources>
|
||||
@ -1,4 +1,4 @@
|
||||
package org.opencv.samples.s0;
|
||||
package org.opencv.samples.tutorial0;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.opencv.samples.s0;
|
||||
package org.opencv.samples.tutorial0;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Bitmap;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.opencv.samples.s1;
|
||||
package org.opencv.samples.tutorial0;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry kind="src" path="opencv2.3.1_src"/>
|
||||
<classpathentry kind="src" path="OpenCV-2.3.1_src"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>Sample 1 Java API</name>
|
||||
<name>Tutorial 1 Basic - 1. Add OpenCV</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
@ -32,9 +32,9 @@
|
||||
</natures>
|
||||
<linkedResources>
|
||||
<link>
|
||||
<name>opencv2.3.1_src</name>
|
||||
<name>OpenCV-2.3.1_src</name>
|
||||
<type>2</type>
|
||||
<locationURI>_android_opencv2_3_1_d2471b5d/src</locationURI>
|
||||
<locationURI>_android_OpenCV-2_3_1_d2471b5d/src</locationURI>
|
||||
</link>
|
||||
</linkedResources>
|
||||
</projectDescription>
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.opencv.samples.s1"
|
||||
package="org.opencv.samples.tutorial1"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
|
||||
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Tutorial 1 Basic - 1. Add OpenCV</string>
|
||||
</resources>
|
||||
@ -1,4 +1,4 @@
|
||||
package org.opencv.samples.s1;
|
||||
package org.opencv.samples.tutorial1;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.opencv.samples.s1;
|
||||
package org.opencv.samples.tutorial1;
|
||||
|
||||
import org.opencv.*;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.opencv.samples.s0;
|
||||
package org.opencv.samples.tutorial1;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry kind="src" path="opencv2.3.1_src"/>
|
||||
<classpathentry kind="src" path="OpenCV-2.3.1_src"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |