Tutorial4 sample renamed to Tutorial-2-MixedProcessing

diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt
index 5b13b72..4443ceb 100644 (file)
--- a/samples/android/CMakeLists.txt
+++ b/samples/android/CMakeLists.txt
@@ -12,7 +12,7 @@ add_subdirectory(image-manipulations)
 add_subdirectory(color-blob-detection)
 
 add_subdirectory(tutorial-1-camerapreview)
-add_subdirectory(tutorial-4-mixed)
+add_subdirectory(tutorial-2-mixedprocessing)
 add_subdirectory(tutorial-5-cameracontrol)
 
 #hello-android sample

diff --git a/samples/android/tutorial-4-mixed/.classpath b/samples/android/tutorial-2-mixedprocessing/.classpath
similarity index 100%
rename from samples/android/tutorial-4-mixed/.classpath
rename to samples/android/tutorial-2-mixedprocessing/.classpath

diff --git a/samples/android/tutorial-4-mixed/.cproject b/samples/android/tutorial-2-mixedprocessing/.cproject
similarity index 100%
rename from samples/android/tutorial-4-mixed/.cproject
rename to samples/android/tutorial-2-mixedprocessing/.cproject

diff --git a/samples/android/tutorial-4-mixed/.project b/samples/android/tutorial-2-mixedprocessing/.project
similarity index 100%
rename from samples/android/tutorial-4-mixed/.project
rename to samples/android/tutorial-2-mixedprocessing/.project

diff --git a/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-2-mixedprocessing/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs
rename to samples/android/tutorial-2-mixedprocessing/.settings/org.eclipse.jdt.core.prefs

diff --git a/samples/android/tutorial-4-mixed/AndroidManifest.xml b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml
similarity index 93%
rename from samples/android/tutorial-4-mixed/AndroidManifest.xml
rename to samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml
index 22266fb..5c6e487 100644 (file)
--- a/samples/android/tutorial-4-mixed/AndroidManifest.xml
+++ b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml
@@ -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.tutorial4"
+          package="org.opencv.samples.tutorial2"
           android:versionCode="21"
           android:versionName="2.1">
 
@@ -9,7 +9,7 @@
         android:icon="@drawable/icon"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
 
-        <activity android:name="Sample4Mixed"
+        <activity android:name="Sample2MixedProcessing"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
                   android:configChanges="keyboardHidden|orientation">

diff --git a/samples/android/tutorial-4-mixed/CMakeLists.txt b/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt
similarity index 87%
rename from samples/android/tutorial-4-mixed/CMakeLists.txt
rename to samples/android/tutorial-2-mixedprocessing/CMakeLists.txt
index 2fac584..bf62514 100644 (file)
--- a/samples/android/tutorial-4-mixed/CMakeLists.txt
+++ b/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(sample example-tutorial-4-mixed)
+set(sample example-tutorial-2-nativeprocessing)
 
 if(BUILD_FAT_JAVA_LIB)
   set(native_deps opencv_java)

diff --git a/samples/android/tutorial-4-mixed/jni/Android.mk b/samples/android/tutorial-2-mixedprocessing/jni/Android.mk
similarity index 100%
rename from samples/android/tutorial-4-mixed/jni/Android.mk
rename to samples/android/tutorial-2-mixedprocessing/jni/Android.mk

diff --git a/samples/android/tutorial-4-mixed/jni/Application.mk b/samples/android/tutorial-2-mixedprocessing/jni/Application.mk
similarity index 100%
rename from samples/android/tutorial-4-mixed/jni/Application.mk
rename to samples/android/tutorial-2-mixedprocessing/jni/Application.mk

diff --git a/samples/android/tutorial-4-mixed/jni/jni_part.cpp b/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
similarity index 65%
rename from samples/android/tutorial-4-mixed/jni/jni_part.cpp
rename to samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
index 957eda1..d5d4e23 100644 (file)
--- a/samples/android/tutorial-4-mixed/jni/jni_part.cpp
+++ b/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
@@ -8,9 +8,9 @@ using namespace std;
 using namespace cv;
 
 extern "C" {
-JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Sample4Mixed_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba);
+JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Sample2NativeProcessing_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba);
 
-JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Sample4Mixed_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba)
+JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Sample2NativeProcessing_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba)
 {
     Mat& mGr  = *(Mat*)addrGray;
     Mat& mRgb = *(Mat*)addrRgba;

diff --git a/samples/android/tutorial-4-mixed/res/drawable/icon.png b/samples/android/tutorial-2-mixedprocessing/res/drawable/icon.png
similarity index 100%
rename from samples/android/tutorial-4-mixed/res/drawable/icon.png
rename to samples/android/tutorial-2-mixedprocessing/res/drawable/icon.png

diff --git a/samples/android/tutorial-4-mixed/res/layout/tutorial4_surface_view.xml b/samples/android/tutorial-2-mixedprocessing/res/layout/tutorial2_surface_view.xml
similarity index 85%
rename from samples/android/tutorial-4-mixed/res/layout/tutorial4_surface_view.xml
rename to samples/android/tutorial-2-mixedprocessing/res/layout/tutorial2_surface_view.xml
index 71cd6e0..a176669 100644 (file)
--- a/samples/android/tutorial-4-mixed/res/layout/tutorial4_surface_view.xml
+++ b/samples/android/tutorial-2-mixedprocessing/res/layout/tutorial2_surface_view.xml
@@ -6,6 +6,6 @@
     <org.opencv.android.JavaCameraView
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:id="@+id/tutorial4_activity_surface_view" />
+        android:id="@+id/tutorial2_activity_surface_view" />
 
 </LinearLayout>

diff --git a/samples/android/tutorial-2-mixedprocessing/res/values/strings.xml b/samples/android/tutorial-2-mixedprocessing/res/values/strings.xml
new file mode 100644 (file)
index 0000000..0ecc4bb
--- /dev/null
+++ b/samples/android/tutorial-2-mixedprocessing/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">OCV T2 Mixed Processing</string>
+</resources>

diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java
similarity index 95%
rename from samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
rename to samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java
index 97a563b..c56fa87 100644 (file)
--- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
+++ b/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java
@@ -1,4 +1,4 @@
-package org.opencv.samples.tutorial4;
+package org.opencv.samples.tutorial2;
 
 import org.opencv.android.BaseLoaderCallback;
 import org.opencv.android.CameraBridgeViewBase.CvCameraViewFrame;
@@ -17,7 +17,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.WindowManager;
 
-public class Sample4Mixed extends Activity implements CvCameraViewListener2 {
+public class Sample2MixedProcessing extends Activity implements CvCameraViewListener2 {
     private static final String    TAG = "OCVSample::Activity";
 
     private static final int       VIEW_MODE_RGBA     = 0;
@@ -58,7 +58,7 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener2 {
         }
     };
 
-    public Sample4Mixed() {
+    public Sample2MixedProcessing() {
         Log.i(TAG, "Instantiated new " + this.getClass());
     }
 
@@ -69,9 +69,9 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener2 {
         super.onCreate(savedInstanceState);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
-        setContentView(R.layout.tutorial4_surface_view);
+        setContentView(R.layout.tutorial2_surface_view);
 
-        mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial4_activity_surface_view);
+        mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial2_activity_surface_view);
         mOpenCvCameraView.setCvCameraViewListener(this);
     }
 

diff --git a/samples/android/tutorial-4-mixed/res/values/strings.xml b/samples/android/tutorial-4-mixed/res/values/strings.xml
deleted file mode 100644 (file)
index da2b018..0000000
--- a/samples/android/tutorial-4-mixed/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">OCV T4 Mix Java+Native OpenCV</string>
-</resources>