From 33502c86acec0ad955a419d5f053a5bda5020872 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 4 Feb 2013 17:26:43 +0400 Subject: [PATCH 1/8] Tutorial 1 renamed --- samples/android/CMakeLists.txt | 2 +- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../AndroidManifest.xml | 0 .../CMakeLists.txt | 2 +- .../res/drawable/icon.png | Bin .../res/layout/tutorial1_surface_view.xml | 0 .../res/values/strings.xml | 2 +- .../org/opencv/samples/tutorial1/Sample1Java.java | 2 +- 10 files changed, 4 insertions(+), 4 deletions(-) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/.classpath (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/.project (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/.settings/org.eclipse.jdt.core.prefs (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/AndroidManifest.xml (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/CMakeLists.txt (82%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/res/drawable/icon.png (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/res/layout/tutorial1_surface_view.xml (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/res/values/strings.xml (52%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/src/org/opencv/samples/tutorial1/Sample1Java.java (98%) diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index b1cb628338..3829419d24 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory(face-detection) add_subdirectory(image-manipulations) add_subdirectory(color-blob-detection) -add_subdirectory(tutorial-1-addopencv) +add_subdirectory(tutorial-1-camerapreview) add_subdirectory(tutorial-2-opencvcamera) add_subdirectory(tutorial-3-native) add_subdirectory(tutorial-4-mixed) diff --git a/samples/android/tutorial-1-addopencv/.classpath b/samples/android/tutorial-1-camerapreview/.classpath similarity index 100% rename from samples/android/tutorial-1-addopencv/.classpath rename to samples/android/tutorial-1-camerapreview/.classpath diff --git a/samples/android/tutorial-1-addopencv/.project b/samples/android/tutorial-1-camerapreview/.project similarity index 100% rename from samples/android/tutorial-1-addopencv/.project rename to samples/android/tutorial-1-camerapreview/.project diff --git a/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-1-camerapreview/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-1-camerapreview/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/tutorial-1-addopencv/AndroidManifest.xml b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml similarity index 100% rename from samples/android/tutorial-1-addopencv/AndroidManifest.xml rename to samples/android/tutorial-1-camerapreview/AndroidManifest.xml diff --git a/samples/android/tutorial-1-addopencv/CMakeLists.txt b/samples/android/tutorial-1-camerapreview/CMakeLists.txt similarity index 82% rename from samples/android/tutorial-1-addopencv/CMakeLists.txt rename to samples/android/tutorial-1-camerapreview/CMakeLists.txt index eb5bc79826..77ed5bce8f 100644 --- a/samples/android/tutorial-1-addopencv/CMakeLists.txt +++ b/samples/android/tutorial-1-camerapreview/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-1-addopencv) +set(sample example-tutorial-1-camerapreview) add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET}) if(TARGET ${sample}) diff --git a/samples/android/tutorial-1-addopencv/res/drawable/icon.png b/samples/android/tutorial-1-camerapreview/res/drawable/icon.png similarity index 100% rename from samples/android/tutorial-1-addopencv/res/drawable/icon.png rename to samples/android/tutorial-1-camerapreview/res/drawable/icon.png diff --git a/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml b/samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml similarity index 100% rename from samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml rename to samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml diff --git a/samples/android/tutorial-1-addopencv/res/values/strings.xml b/samples/android/tutorial-1-camerapreview/res/values/strings.xml similarity index 52% rename from samples/android/tutorial-1-addopencv/res/values/strings.xml rename to samples/android/tutorial-1-camerapreview/res/values/strings.xml index c5e8998839..fa803da041 100644 --- a/samples/android/tutorial-1-addopencv/res/values/strings.xml +++ b/samples/android/tutorial-1-camerapreview/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T1 Add OpenCV + OCV T1 Camera Preview diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java similarity index 98% rename from samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java rename to samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java index 1fbac34fef..9e84ef71bb 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java +++ b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java @@ -88,7 +88,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 { @Override public boolean onCreateOptionsMenu(Menu menu) { Log.i(TAG, "called onCreateOptionsMenu"); - mItemSwitchCamera = menu.add("Switch camera"); + mItemSwitchCamera = menu.add("Toggle Native/Java camera"); return true; } From b94327755993e20f0832088bcb0c216b1f283899 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 4 Feb 2013 17:28:55 +0400 Subject: [PATCH 2/8] Tutorial-2 removed as dublicate of tutorial-1 and image manipulations sample. --- samples/android/CMakeLists.txt | 1 - .../tutorial-2-opencvcamera/.classpath | 8 ---- .../android/tutorial-2-opencvcamera/.project | 33 --------------- .../.settings/org.eclipse.jdt.core.prefs | 4 -- .../AndroidManifest.xml | 38 ------------------ .../tutorial-2-opencvcamera/CMakeLists.txt | 7 ---- .../res/drawable/icon.png | Bin 1997 -> 0 bytes .../res/layout/tutorial2_surface_view.xml | 11 ----- .../res/values/strings.xml | 4 -- 9 files changed, 106 deletions(-) delete mode 100644 samples/android/tutorial-2-opencvcamera/.classpath delete mode 100644 samples/android/tutorial-2-opencvcamera/.project delete mode 100644 samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs delete mode 100644 samples/android/tutorial-2-opencvcamera/AndroidManifest.xml delete mode 100644 samples/android/tutorial-2-opencvcamera/CMakeLists.txt delete mode 100644 samples/android/tutorial-2-opencvcamera/res/drawable/icon.png delete mode 100644 samples/android/tutorial-2-opencvcamera/res/layout/tutorial2_surface_view.xml delete mode 100644 samples/android/tutorial-2-opencvcamera/res/values/strings.xml diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index 3829419d24..154712afa7 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -12,7 +12,6 @@ add_subdirectory(image-manipulations) add_subdirectory(color-blob-detection) add_subdirectory(tutorial-1-camerapreview) -add_subdirectory(tutorial-2-opencvcamera) add_subdirectory(tutorial-3-native) add_subdirectory(tutorial-4-mixed) add_subdirectory(tutorial-5-cameracontrol) diff --git a/samples/android/tutorial-2-opencvcamera/.classpath b/samples/android/tutorial-2-opencvcamera/.classpath deleted file mode 100644 index 3f9691c5dd..0000000000 --- a/samples/android/tutorial-2-opencvcamera/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/samples/android/tutorial-2-opencvcamera/.project b/samples/android/tutorial-2-opencvcamera/.project deleted file mode 100644 index 1d6c7f62ce..0000000000 --- a/samples/android/tutorial-2-opencvcamera/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - OpenCV Tutorial 2 - Use OpenCV Camera - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2ddc8..0000000000 --- a/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml deleted file mode 100644 index 3378b40e67..0000000000 --- a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-2-opencvcamera/CMakeLists.txt b/samples/android/tutorial-2-opencvcamera/CMakeLists.txt deleted file mode 100644 index 685f870b6f..0000000000 --- a/samples/android/tutorial-2-opencvcamera/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(sample example-tutorial-2-opencvcamera) - -add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET}) -if(TARGET ${sample}) - add_dependencies(opencv_android_examples ${sample}) -endif() - diff --git a/samples/android/tutorial-2-opencvcamera/res/drawable/icon.png b/samples/android/tutorial-2-opencvcamera/res/drawable/icon.png deleted file mode 100644 index 630454927b592eb585c21527c430fc739c7970a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1997 zcmV;;2Qv7HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2iyk& z2s4Z(uWcvB1k+?B|HcZ5+p(*;Q^&-8AtzSnVCK7?)^Xiwf0*7z0ZN;t#z9i`sgtpqdV3hDNF*c2bKc!qcQaX zUny)Tz}^_l!dPca%!U9i64N>!i~1_h=?F58~*Mqs?aUag-wNp3eJ zaArHlobMV1PMO^yg*noOAUz|E0i{}8`nIiHOW|~F4mjoR_GH_vZVKN?bHNdXe;To> zxdyn_TnD>62p5lGlR~e9qrf7C+ui6sX@;J1@Mx>Yo=qMBRs~*)bDAoXUZYSHTab?f z_PACCXF@bcF}lW`X>mi~9D%@SGZ2{F%CTpbhLf>?v)%*vE3D~)z{*wz=t^t3pfEGA zffL(4AU5DX%yUkKoB_Jb(8oFW!NI-`j{z#&Z&^_sT-34vIXFYp`=GEPgYAu)4n9D4 z%K`*+8v7m2z|O!Kz|Xto?PB|!;VL`0G=ur`jDlQ$D=+i6dSt)j#Si?i#3rh3ZDkkx z+9TWVDcFEP;8fsZmts4LZyQ^=NS&&oMq^DBPd9*r!p~~YrdwMdQuxcK)CgcvlC7iQ z6m}XDL=_ke!d;S<2IvOy5aI>4B-sk!6i-qAqn6i#qR%}BH;aqaE~#zv6|u2ViZHn? z1hW8E8rkz`nyn$2WU0dhK4^p<)W{{jH|2^S^#FZ&jV&V)7;HC58VOgls*{S?bCuB! zgJG~P)&TrE+Oa9jPq^~G`MQI^ISDar1?}7f7D?&qi-Zc{Oivqep0%xlm22B7?$lt? zRDoZ$&ZSsjO2nE0ft%CR$aVrKp5WRX7^zue>Cw3+QGx=M@MFBYs{CEWmLZ zN*9hpz)s*B96QRjjj`Qi_;Vb>Z73h0DK9}$-axr}l%1BFSp9)x9Ky;`(^n%*$`F!V zkY*oPaAK+6&unXUeSit`5c;F3iU&9)kOVILi%-C3#za9jc>jUr;Wvs~#jZ#FaZ!2fi34Sb1N@BsFCj&@J zs;eb(o@Ffe=D?d6qPKGdXKQjn9~5j94Pu>ge`)`61V~3frX{l7>dTEi%6<8;N9K*(u}%^bWomltk*Vp@k|^lo)yA?qH}(jBlCHBo51XA|gNf(* zoeh<>k{r9Y4)pw$!k7FX&+PyB(?mq~(*^;K7{UQF&X#s!ILS zHX&7zhmyZ|_z=x$C7sRWW=r7+&daHU&gPWWQt)uC*X>tEFZ6J;H6WaAcCCQRo2VjP z>v8^kmJJ*U_eqdHY-p9+xixW&Umgf^mpLS>_nMj zvaJlD2pv8o7#@|SuT=D$XZ)5=GJyZFvEPhNoO#NE^Nc>q2{?8F#Z+({^MQk9zw9zH z=)VjA4HzfT(Fq(eDSwVGl!7_^3!$70OgHG7MYIxpx7Q{~Cgnag|7WoceAizs@IKwlGBBq*Ioi0qby4ylKkgqvR5BcLR&Vy39?8 - - - - diff --git a/samples/android/tutorial-2-opencvcamera/res/values/strings.xml b/samples/android/tutorial-2-opencvcamera/res/values/strings.xml deleted file mode 100644 index c5405b9cb5..0000000000 --- a/samples/android/tutorial-2-opencvcamera/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - OCV T2 Use OpenCV Camera - From 08cd51df1f93579a2e2263b946029550dc8c8841 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 5 Feb 2013 12:19:11 +0400 Subject: [PATCH 3/8] Tutorial-3 removed as dublicate part of tutorial-4. --- samples/android/CMakeLists.txt | 1 - samples/android/tutorial-3-native/.classpath | 8 -- samples/android/tutorial-3-native/.cproject | 75 ------------- samples/android/tutorial-3-native/.project | 101 ------------------ .../.settings/org.eclipse.jdt.core.prefs | 4 - .../tutorial-3-native/AndroidManifest.xml | 38 ------- .../android/tutorial-3-native/CMakeLists.txt | 12 --- .../android/tutorial-3-native/jni/Android.mk | 11 -- .../tutorial-3-native/jni/Application.mk | 4 - .../tutorial-3-native/jni/jni_part.cpp | 27 ----- .../tutorial-3-native/res/drawable/icon.png | Bin 1997 -> 0 bytes .../res/layout/tutorial3_surface_view.xml | 11 -- .../tutorial-3-native/res/values/strings.xml | 4 - 13 files changed, 296 deletions(-) delete mode 100644 samples/android/tutorial-3-native/.classpath delete mode 100644 samples/android/tutorial-3-native/.cproject delete mode 100644 samples/android/tutorial-3-native/.project delete mode 100644 samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs delete mode 100644 samples/android/tutorial-3-native/AndroidManifest.xml delete mode 100644 samples/android/tutorial-3-native/CMakeLists.txt delete mode 100644 samples/android/tutorial-3-native/jni/Android.mk delete mode 100644 samples/android/tutorial-3-native/jni/Application.mk delete mode 100644 samples/android/tutorial-3-native/jni/jni_part.cpp delete mode 100644 samples/android/tutorial-3-native/res/drawable/icon.png delete mode 100644 samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml delete mode 100644 samples/android/tutorial-3-native/res/values/strings.xml diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index 154712afa7..5b13b72c2a 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -12,7 +12,6 @@ add_subdirectory(image-manipulations) add_subdirectory(color-blob-detection) add_subdirectory(tutorial-1-camerapreview) -add_subdirectory(tutorial-3-native) add_subdirectory(tutorial-4-mixed) add_subdirectory(tutorial-5-cameracontrol) diff --git a/samples/android/tutorial-3-native/.classpath b/samples/android/tutorial-3-native/.classpath deleted file mode 100644 index d3bb07b44c..0000000000 --- a/samples/android/tutorial-3-native/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/samples/android/tutorial-3-native/.cproject b/samples/android/tutorial-3-native/.cproject deleted file mode 100644 index 0ea6ad6495..0000000000 --- a/samples/android/tutorial-3-native/.cproject +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-3-native/.project b/samples/android/tutorial-3-native/.project deleted file mode 100644 index 2c27e6567b..0000000000 --- a/samples/android/tutorial-3-native/.project +++ /dev/null @@ -1,101 +0,0 @@ - - - OpenCV Tutorial 3 - Add Native OpenCV - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - auto,full,incremental, - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.autoBuildTarget - - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.buildCommand - ${NDKROOT}/ndk-build.cmd - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - true - - - org.eclipse.cdt.make.core.enableCleanBuild - false - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.fullBuildTarget - - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - false - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2ddc8..0000000000 --- a/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/samples/android/tutorial-3-native/AndroidManifest.xml b/samples/android/tutorial-3-native/AndroidManifest.xml deleted file mode 100644 index 164b81d8d4..0000000000 --- a/samples/android/tutorial-3-native/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-3-native/CMakeLists.txt b/samples/android/tutorial-3-native/CMakeLists.txt deleted file mode 100644 index c3c1970a9e..0000000000 --- a/samples/android/tutorial-3-native/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(sample example-tutorial-3-native) - -if(BUILD_FAT_JAVA_LIB) - set(native_deps opencv_java) -else() - set(native_deps opencv_features2d) -endif() - -add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET} NATIVE_DEPS ${native_deps}) -if(TARGET ${sample}) - add_dependencies(opencv_android_examples ${sample}) -endif() diff --git a/samples/android/tutorial-3-native/jni/Android.mk b/samples/android/tutorial-3-native/jni/Android.mk deleted file mode 100644 index 372d65a1d0..0000000000 --- a/samples/android/tutorial-3-native/jni/Android.mk +++ /dev/null @@ -1,11 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -include ../../sdk/native/jni/OpenCV.mk - -LOCAL_MODULE := native_sample -LOCAL_SRC_FILES := jni_part.cpp -LOCAL_LDLIBS += -llog -ldl - -include $(BUILD_SHARED_LIBRARY) diff --git a/samples/android/tutorial-3-native/jni/Application.mk b/samples/android/tutorial-3-native/jni/Application.mk deleted file mode 100644 index 4fffcb2838..0000000000 --- a/samples/android/tutorial-3-native/jni/Application.mk +++ /dev/null @@ -1,4 +0,0 @@ -APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -fexceptions -APP_ABI := armeabi-v7a -APP_PLATFORM := android-8 diff --git a/samples/android/tutorial-3-native/jni/jni_part.cpp b/samples/android/tutorial-3-native/jni/jni_part.cpp deleted file mode 100644 index aa9acac494..0000000000 --- a/samples/android/tutorial-3-native/jni/jni_part.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include -#include -#include -#include - -using namespace std; -using namespace cv; - -extern "C" { -JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial3_Sample3Native_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); - -JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial3_Sample3Native_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) -{ - Mat& mGr = *(Mat*)addrGray; - Mat& mRgb = *(Mat*)addrRgba; - vector v; - - FastFeatureDetector detector(50); - detector.detect(mGr, v); - for( unsigned int i = 0; i < v.size(); i++ ) - { - const KeyPoint& kp = v[i]; - circle(mRgb, Point(kp.pt.x, kp.pt.y), 10, Scalar(255,0,0,255)); - } -} -} diff --git a/samples/android/tutorial-3-native/res/drawable/icon.png b/samples/android/tutorial-3-native/res/drawable/icon.png deleted file mode 100644 index 630454927b592eb585c21527c430fc739c7970a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1997 zcmV;;2Qv7HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2iyk& z2s4Z(uWcvB1k+?B|HcZ5+p(*;Q^&-8AtzSnVCK7?)^Xiwf0*7z0ZN;t#z9i`sgtpqdV3hDNF*c2bKc!qcQaX zUny)Tz}^_l!dPca%!U9i64N>!i~1_h=?F58~*Mqs?aUag-wNp3eJ zaArHlobMV1PMO^yg*noOAUz|E0i{}8`nIiHOW|~F4mjoR_GH_vZVKN?bHNdXe;To> zxdyn_TnD>62p5lGlR~e9qrf7C+ui6sX@;J1@Mx>Yo=qMBRs~*)bDAoXUZYSHTab?f z_PACCXF@bcF}lW`X>mi~9D%@SGZ2{F%CTpbhLf>?v)%*vE3D~)z{*wz=t^t3pfEGA zffL(4AU5DX%yUkKoB_Jb(8oFW!NI-`j{z#&Z&^_sT-34vIXFYp`=GEPgYAu)4n9D4 z%K`*+8v7m2z|O!Kz|Xto?PB|!;VL`0G=ur`jDlQ$D=+i6dSt)j#Si?i#3rh3ZDkkx z+9TWVDcFEP;8fsZmts4LZyQ^=NS&&oMq^DBPd9*r!p~~YrdwMdQuxcK)CgcvlC7iQ z6m}XDL=_ke!d;S<2IvOy5aI>4B-sk!6i-qAqn6i#qR%}BH;aqaE~#zv6|u2ViZHn? z1hW8E8rkz`nyn$2WU0dhK4^p<)W{{jH|2^S^#FZ&jV&V)7;HC58VOgls*{S?bCuB! zgJG~P)&TrE+Oa9jPq^~G`MQI^ISDar1?}7f7D?&qi-Zc{Oivqep0%xlm22B7?$lt? zRDoZ$&ZSsjO2nE0ft%CR$aVrKp5WRX7^zue>Cw3+QGx=M@MFBYs{CEWmLZ zN*9hpz)s*B96QRjjj`Qi_;Vb>Z73h0DK9}$-axr}l%1BFSp9)x9Ky;`(^n%*$`F!V zkY*oPaAK+6&unXUeSit`5c;F3iU&9)kOVILi%-C3#za9jc>jUr;Wvs~#jZ#FaZ!2fi34Sb1N@BsFCj&@J zs;eb(o@Ffe=D?d6qPKGdXKQjn9~5j94Pu>ge`)`61V~3frX{l7>dTEi%6<8;N9K*(u}%^bWomltk*Vp@k|^lo)yA?qH}(jBlCHBo51XA|gNf(* zoeh<>k{r9Y4)pw$!k7FX&+PyB(?mq~(*^;K7{UQF&X#s!ILS zHX&7zhmyZ|_z=x$C7sRWW=r7+&daHU&gPWWQt)uC*X>tEFZ6J;H6WaAcCCQRo2VjP z>v8^kmJJ*U_eqdHY-p9+xixW&Umgf^mpLS>_nMj zvaJlD2pv8o7#@|SuT=D$XZ)5=GJyZFvEPhNoO#NE^Nc>q2{?8F#Z+({^MQk9zw9zH z=)VjA4HzfT(Fq(eDSwVGl!7_^3!$70OgHG7MYIxpx7Q{~Cgnag|7WoceAizs@IKwlGBBq*Ioi0qby4ylKkgqvR5BcLR&Vy39?8 - - - - diff --git a/samples/android/tutorial-3-native/res/values/strings.xml b/samples/android/tutorial-3-native/res/values/strings.xml deleted file mode 100644 index 41c54207ee..0000000000 --- a/samples/android/tutorial-3-native/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - OCV T3 Add Native OpenCV - From 902463b6e98d2e919eb1f26586b26356856bb9e5 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 5 Feb 2013 13:12:00 +0400 Subject: [PATCH 4/8] Tutorial4 sample renamed to Tutorial-2-MixedProcessing --- samples/android/CMakeLists.txt | 2 +- .../.classpath | 0 .../.cproject | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../AndroidManifest.xml | 4 ++-- .../CMakeLists.txt | 2 +- .../jni/Android.mk | 0 .../jni/Application.mk | 0 .../jni/jni_part.cpp | 4 ++-- .../res/drawable/icon.png | Bin .../res/layout/tutorial2_surface_view.xml} | 2 +- .../res/values/strings.xml | 4 ++++ .../samples/tutorial2/Sample2MixedProcessing.java} | 10 +++++----- .../android/tutorial-4-mixed/res/values/strings.xml | 4 ---- 15 files changed, 16 insertions(+), 16 deletions(-) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/.classpath (100%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/.cproject (100%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/.project (100%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/.settings/org.eclipse.jdt.core.prefs (100%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/AndroidManifest.xml (93%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/CMakeLists.txt (87%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/jni/Android.mk (100%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/jni/Application.mk (100%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/jni/jni_part.cpp (65%) rename samples/android/{tutorial-4-mixed => tutorial-2-mixedprocessing}/res/drawable/icon.png (100%) rename samples/android/{tutorial-4-mixed/res/layout/tutorial4_surface_view.xml => tutorial-2-mixedprocessing/res/layout/tutorial2_surface_view.xml} (85%) create mode 100644 samples/android/tutorial-2-mixedprocessing/res/values/strings.xml rename samples/android/{tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java => tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java} (95%) delete mode 100644 samples/android/tutorial-4-mixed/res/values/strings.xml diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index 5b13b72c2a..4443cebe14 100644 --- 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 22266fb765..5c6e487359 100644 --- a/samples/android/tutorial-4-mixed/AndroidManifest.xml +++ b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - 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 2fac5843bb..bf62514d92 100644 --- 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 957eda12f8..d5d4e239c5 100644 --- 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 71cd6e04cb..a176669aa0 100644 --- 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 @@ + android:id="@+id/tutorial2_activity_surface_view" /> 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 index 0000000000..0ecc4bb60e --- /dev/null +++ b/samples/android/tutorial-2-mixedprocessing/res/values/strings.xml @@ -0,0 +1,4 @@ + + + OCV T2 Mixed Processing + 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 97a563be4c..c56fa87e38 100644 --- 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 index da2b018d61..0000000000 --- a/samples/android/tutorial-4-mixed/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - OCV T4 Mix Java+Native OpenCV - From b558bb4894863ed9a67bde2cf55284df89137784 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 5 Feb 2013 15:10:34 +0400 Subject: [PATCH 5/8] Tutorial-5 -> Tutorial-3 --- samples/android/CMakeLists.txt | 2 +- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../AndroidManifest.xml | 4 ++-- .../CMakeLists.txt | 2 +- .../res/drawable/icon.png | Bin .../res/layout/tutorial3_surface_view.xml} | 2 +- .../res/values/strings.xml | 2 +- .../samples/tutorial5/Sample3CameraControl.java} | 12 ++++++------ .../samples/tutorial5/SampleJavaCameraView.java | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) rename samples/android/{tutorial-5-cameracontrol => tutorial-3-cameracontrol}/.classpath (100%) rename samples/android/{tutorial-5-cameracontrol => tutorial-3-cameracontrol}/.project (100%) rename samples/android/{tutorial-5-cameracontrol => tutorial-3-cameracontrol}/.settings/org.eclipse.jdt.core.prefs (100%) rename samples/android/{tutorial-5-cameracontrol => tutorial-3-cameracontrol}/AndroidManifest.xml (93%) rename samples/android/{tutorial-5-cameracontrol => tutorial-3-cameracontrol}/CMakeLists.txt (82%) rename samples/android/{tutorial-5-cameracontrol => tutorial-3-cameracontrol}/res/drawable/icon.png (100%) rename samples/android/{tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml => tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml} (86%) rename samples/android/{tutorial-5-cameracontrol => tutorial-3-cameracontrol}/res/values/strings.xml (52%) rename samples/android/{tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java => tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java} (95%) rename samples/android/{tutorial-5-cameracontrol => tutorial-3-cameracontrol}/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java (98%) diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index 4443cebe14..a0794cb972 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory(color-blob-detection) add_subdirectory(tutorial-1-camerapreview) add_subdirectory(tutorial-2-mixedprocessing) -add_subdirectory(tutorial-5-cameracontrol) +add_subdirectory(tutorial-3-cameracontrol) #hello-android sample if(HAVE_opencv_highgui) diff --git a/samples/android/tutorial-5-cameracontrol/.classpath b/samples/android/tutorial-3-cameracontrol/.classpath similarity index 100% rename from samples/android/tutorial-5-cameracontrol/.classpath rename to samples/android/tutorial-3-cameracontrol/.classpath diff --git a/samples/android/tutorial-5-cameracontrol/.project b/samples/android/tutorial-3-cameracontrol/.project similarity index 100% rename from samples/android/tutorial-5-cameracontrol/.project rename to samples/android/tutorial-3-cameracontrol/.project diff --git a/samples/android/tutorial-5-cameracontrol/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-3-cameracontrol/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/tutorial-5-cameracontrol/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-3-cameracontrol/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/tutorial-5-cameracontrol/AndroidManifest.xml b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml similarity index 93% rename from samples/android/tutorial-5-cameracontrol/AndroidManifest.xml rename to samples/android/tutorial-3-cameracontrol/AndroidManifest.xml index 053033d6c0..fe7335449b 100644 --- a/samples/android/tutorial-5-cameracontrol/AndroidManifest.xml +++ b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-5-cameracontrol/CMakeLists.txt b/samples/android/tutorial-3-cameracontrol/CMakeLists.txt similarity index 82% rename from samples/android/tutorial-5-cameracontrol/CMakeLists.txt rename to samples/android/tutorial-3-cameracontrol/CMakeLists.txt index 986f75402e..45c0af2c31 100644 --- a/samples/android/tutorial-5-cameracontrol/CMakeLists.txt +++ b/samples/android/tutorial-3-cameracontrol/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-5-cameracontrol) +set(sample example-tutorial-3-cameracontrol) add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET}) if(TARGET ${sample}) diff --git a/samples/android/tutorial-5-cameracontrol/res/drawable/icon.png b/samples/android/tutorial-3-cameracontrol/res/drawable/icon.png similarity index 100% rename from samples/android/tutorial-5-cameracontrol/res/drawable/icon.png rename to samples/android/tutorial-3-cameracontrol/res/drawable/icon.png diff --git a/samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml similarity index 86% rename from samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml rename to samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml index 36376e56bc..dde812543d 100644 --- a/samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml +++ b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml @@ -7,6 +7,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:visibility="gone" - android:id="@+id/tutorial5_activity_java_surface_view" /> + android:id="@+id/tutorial3_activity_java_surface_view" /> diff --git a/samples/android/tutorial-5-cameracontrol/res/values/strings.xml b/samples/android/tutorial-3-cameracontrol/res/values/strings.xml similarity index 52% rename from samples/android/tutorial-5-cameracontrol/res/values/strings.xml rename to samples/android/tutorial-3-cameracontrol/res/values/strings.xml index bf1a740ffb..d3fb56d945 100644 --- a/samples/android/tutorial-5-cameracontrol/res/values/strings.xml +++ b/samples/android/tutorial-3-cameracontrol/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T5 Camera Control + OCV T3 Camera Control diff --git a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java similarity index 95% rename from samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java index f19580b496..4c3a263ee0 100644 --- a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java @@ -1,4 +1,4 @@ -package org.opencv.samples.tutorial5; +package org.opencv.samples.tutorial3; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,7 +28,7 @@ import android.view.View.OnTouchListener; import android.view.WindowManager; import android.widget.Toast; -public class Sample5CameraControl extends Activity implements CvCameraViewListener2, OnTouchListener { +public class Sample3CameraControl extends Activity implements CvCameraViewListener2, OnTouchListener { private static final String TAG = "OCVSample::Activity"; private SampleJavaCameraView mOpenCvCameraView; @@ -46,7 +46,7 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen { Log.i(TAG, "OpenCV loaded successfully"); mOpenCvCameraView.enableView(); - mOpenCvCameraView.setOnTouchListener(Sample5CameraControl.this); + mOpenCvCameraView.setOnTouchListener(Sample3CameraControl.this); } break; default: { @@ -56,7 +56,7 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen } }; - public Sample5CameraControl() { + public Sample3CameraControl() { Log.i(TAG, "Instantiated new " + this.getClass()); } @@ -67,9 +67,9 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen super.onCreate(savedInstanceState); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - setContentView(R.layout.tutorial5_surface_view); + setContentView(R.layout.tutorial3_surface_view); - mOpenCvCameraView = (SampleJavaCameraView) findViewById(R.id.tutorial5_activity_java_surface_view); + mOpenCvCameraView = (SampleJavaCameraView) findViewById(R.id.tutorial3_activity_java_surface_view); mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE); diff --git a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java similarity index 98% rename from samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java index da12bb0982..38328a204d 100644 --- a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java @@ -1,4 +1,4 @@ -package org.opencv.samples.tutorial5; +package org.opencv.samples.tutorial3; import java.io.FileOutputStream; import java.util.List; From 507e2dc0ad2e9cbe0c064fa8d154115d81837b3c Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 5 Feb 2013 15:27:23 +0400 Subject: [PATCH 6/8] Project files for Eclipse updated. --- samples/android/tutorial-1-camerapreview/.project | 2 +- samples/android/tutorial-2-mixedprocessing/.cproject | 4 ++-- samples/android/tutorial-2-mixedprocessing/.project | 2 +- samples/android/tutorial-3-cameracontrol/.project | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/android/tutorial-1-camerapreview/.project b/samples/android/tutorial-1-camerapreview/.project index 5ef434a674..bcb4d17186 100644 --- a/samples/android/tutorial-1-camerapreview/.project +++ b/samples/android/tutorial-1-camerapreview/.project @@ -1,6 +1,6 @@ - OpenCV Tutorial 1 - Add OpenCV + OpenCV Tutorial 1 - Camera Preview diff --git a/samples/android/tutorial-2-mixedprocessing/.cproject b/samples/android/tutorial-2-mixedprocessing/.cproject index 57bf7e5a3c..0d1d13e85b 100644 --- a/samples/android/tutorial-2-mixedprocessing/.cproject +++ b/samples/android/tutorial-2-mixedprocessing/.cproject @@ -60,7 +60,7 @@ - + @@ -69,6 +69,6 @@ - + diff --git a/samples/android/tutorial-2-mixedprocessing/.project b/samples/android/tutorial-2-mixedprocessing/.project index 9012394802..c3e05a59aa 100644 --- a/samples/android/tutorial-2-mixedprocessing/.project +++ b/samples/android/tutorial-2-mixedprocessing/.project @@ -1,6 +1,6 @@ - OpenCV Tutorial 4 - Mix Java+Native OpenCV + OpenCV Tutorial 2 - Mixed Processing diff --git a/samples/android/tutorial-3-cameracontrol/.project b/samples/android/tutorial-3-cameracontrol/.project index 40a2d7ff25..bccca2d7ce 100644 --- a/samples/android/tutorial-3-cameracontrol/.project +++ b/samples/android/tutorial-3-cameracontrol/.project @@ -1,6 +1,6 @@ - OpenCV Tutorial 5 - Camera Control + OpenCV Tutorial 3 - Camera Control From 9a2d6f854b6573b3780f061ab0c0d42813cb96ee Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 5 Feb 2013 15:46:47 +0400 Subject: [PATCH 7/8] Tutorial-1-Java -> Tutorial-1-CameraPreview Issues fix. --- .../AndroidManifest.xml | 2 +- .../tutorial2/Sample2NativeCamera.java | 152 ------------------ .../Sample3CameraControl.java | 0 .../SampleJavaCameraView.java | 0 .../samples/tutorial3/Sample3Native.java | 102 ------------ 5 files changed, 1 insertion(+), 255 deletions(-) delete mode 100644 samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java rename samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/{tutorial5 => tutorial3}/Sample3CameraControl.java (100%) rename samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/{tutorial5 => tutorial3}/SampleJavaCameraView.java (100%) delete mode 100644 samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java diff --git a/samples/android/tutorial-1-camerapreview/AndroidManifest.xml b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml index 9b4e797dab..7732f282c8 100644 --- a/samples/android/tutorial-1-camerapreview/AndroidManifest.xml +++ b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java deleted file mode 100644 index 3a19ffd5e4..0000000000 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.opencv.samples.tutorial2; - -import org.opencv.android.BaseLoaderCallback; -import org.opencv.android.CameraBridgeViewBase.CvCameraViewFrame; -import org.opencv.android.LoaderCallbackInterface; -import org.opencv.android.OpenCVLoader; -import org.opencv.core.Core; -import org.opencv.core.CvType; -import org.opencv.core.Mat; -import org.opencv.core.Point; -import org.opencv.core.Scalar; -import org.opencv.android.CameraBridgeViewBase; -import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener2; -import org.opencv.imgproc.Imgproc; - -import android.app.Activity; -import android.os.Bundle; -import android.util.Log; -import android.view.Menu; -import android.view.MenuItem; -import android.view.WindowManager; - -public class Sample2NativeCamera extends Activity implements CvCameraViewListener2 { - private static final String TAG = "OCVSample::Activity"; - - public static final int VIEW_MODE_RGBA = 0; - public static final int VIEW_MODE_GRAY = 1; - public static final int VIEW_MODE_CANNY = 2; - - private static int viewMode = VIEW_MODE_RGBA; - private MenuItem mItemPreviewRGBA; - private MenuItem mItemPreviewGray; - private MenuItem mItemPreviewCanny; - private Mat mRgba; - private Mat mIntermediateMat; - - private CameraBridgeViewBase mOpenCvCameraView; - - private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { - @Override - public void onManagerConnected(int status) { - switch (status) { - case LoaderCallbackInterface.SUCCESS: - { - Log.i(TAG, "OpenCV loaded successfully"); - mOpenCvCameraView.enableView(); - } break; - default: - { - super.onManagerConnected(status); - } break; - } - } - }; - - public Sample2NativeCamera() { - Log.i(TAG, "Instantiated new " + this.getClass()); - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) { - Log.i(TAG, "called onCreate"); - super.onCreate(savedInstanceState); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - - setContentView(R.layout.tutorial2_surface_view); - - mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial2_activity_surface_view); - mOpenCvCameraView.setCvCameraViewListener(this); - } - - @Override - public void onPause() - { - super.onPause(); - if (mOpenCvCameraView != null) - mOpenCvCameraView.disableView(); - } - - @Override - public void onResume() - { - super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); - } - - public void onDestroy() { - super.onDestroy(); - if (mOpenCvCameraView != null) - mOpenCvCameraView.disableView(); - } - - public void onCameraViewStarted(int width, int height) { - mRgba = new Mat(height, width, CvType.CV_8UC4); - mIntermediateMat = new Mat(height, width, CvType.CV_8UC4); - } - - public void onCameraViewStopped() { - mRgba.release(); - mIntermediateMat.release(); - } - - public Mat onCameraFrame(CvCameraViewFrame inputFrame) { - switch (Sample2NativeCamera.viewMode) { - case Sample2NativeCamera.VIEW_MODE_GRAY: - { - Imgproc.cvtColor(inputFrame.gray(), mRgba, Imgproc.COLOR_GRAY2RGBA, 4); - } break; - case Sample2NativeCamera.VIEW_MODE_RGBA: - { - mRgba = inputFrame.rgba(); - Core.putText(mRgba, "OpenCV+Android", new Point(10, mRgba.rows() - 10), 3, 1, new Scalar(255, 0, 0, 255), 2); - } break; - case Sample2NativeCamera.VIEW_MODE_CANNY: - { - Imgproc.Canny(inputFrame.gray(), mIntermediateMat, 80, 100); - Imgproc.cvtColor(mIntermediateMat, mRgba, Imgproc.COLOR_GRAY2BGRA, 4); - } break; - } - - return mRgba; - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - Log.i(TAG, "called onCreateOptionsMenu"); - mItemPreviewRGBA = menu.add("Preview RGBA"); - mItemPreviewGray = menu.add("Preview GRAY"); - mItemPreviewCanny = menu.add("Canny"); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - Log.i(TAG, "called onOptionsItemSelected; selected item: " + item); - if (item == mItemPreviewRGBA) - { - viewMode = VIEW_MODE_RGBA; - } - else if (item == mItemPreviewGray) - { - viewMode = VIEW_MODE_GRAY; - } - else if (item == mItemPreviewCanny) - { - viewMode = VIEW_MODE_CANNY; - } - - return true; - } -} diff --git a/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Sample3CameraControl.java similarity index 100% rename from samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Sample3CameraControl.java diff --git a/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/SampleJavaCameraView.java similarity index 100% rename from samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/SampleJavaCameraView.java diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java deleted file mode 100644 index 71990fab86..0000000000 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.opencv.samples.tutorial3; - -import org.opencv.android.BaseLoaderCallback; -import org.opencv.android.CameraBridgeViewBase.CvCameraViewFrame; -import org.opencv.android.LoaderCallbackInterface; -import org.opencv.android.OpenCVLoader; -import org.opencv.core.CvType; -import org.opencv.core.Mat; -import org.opencv.android.CameraBridgeViewBase; -import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener2; - -import android.app.Activity; -import android.os.Bundle; -import android.util.Log; -import android.view.WindowManager; - -public class Sample3Native extends Activity implements CvCameraViewListener2 { - private static final String TAG = "OCVSample::Activity"; - - private Mat mRgba; - private Mat mGray; - private CameraBridgeViewBase mOpenCvCameraView; - - private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { - @Override - public void onManagerConnected(int status) { - switch (status) { - case LoaderCallbackInterface.SUCCESS: - { - Log.i(TAG, "OpenCV loaded successfully"); - - // Load native library after(!) OpenCV initialization - System.loadLibrary("native_sample"); - - mOpenCvCameraView.enableView(); - } break; - default: - { - super.onManagerConnected(status); - } break; - } - } - }; - - public Sample3Native() { - Log.i(TAG, "Instantiated new " + this.getClass()); - } - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) { - Log.i(TAG, "called onCreate"); - super.onCreate(savedInstanceState); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - - setContentView(R.layout.tutorial3_surface_view); - - mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial4_activity_surface_view); - mOpenCvCameraView.setCvCameraViewListener(this); - } - - @Override - public void onPause() - { - super.onPause(); - if (mOpenCvCameraView != null) - mOpenCvCameraView.disableView(); - } - - @Override - public void onResume() - { - super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback); - } - - public void onDestroy() { - super.onDestroy(); - if (mOpenCvCameraView != null) - mOpenCvCameraView.disableView(); - } - - public void onCameraViewStarted(int width, int height) { - mRgba = new Mat(height, width, CvType.CV_8UC4); - mGray = new Mat(height, width, CvType.CV_8UC1); - } - - public void onCameraViewStopped() { - mRgba.release(); - mGray.release(); - } - - public Mat onCameraFrame(CvCameraViewFrame inputFrame) { - mRgba = inputFrame.rgba(); - mGray = inputFrame.gray(); - FindFeatures(mGray.getNativeObjAddr(), mRgba.getNativeObjAddr()); - - return mRgba; - } - - public native void FindFeatures(long matAddrGr, long matAddrRgba); -} From d067dc5a0517892cedd8afe3fe5e76a3ab114842 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 11 Feb 2013 11:36:12 +0400 Subject: [PATCH 8/8] Code review notes fixed. --- .../tutorial-1-camerapreview/AndroidManifest.xml | 2 +- .../tutorial-1-camerapreview/res/values/strings.xml | 2 +- .../{Sample1Java.java => Tutorial1Activity.java} | 4 ++-- .../tutorial-2-mixedprocessing/AndroidManifest.xml | 2 +- .../android/tutorial-2-mixedprocessing/CMakeLists.txt | 2 +- .../tutorial-2-mixedprocessing/jni/jni_part.cpp | 4 ++-- ...ple2MixedProcessing.java => Tutorial2Activity.java} | 4 ++-- .../tutorial-3-cameracontrol/AndroidManifest.xml | 2 +- .../res/layout/tutorial3_surface_view.xml | 2 +- ...ample3CameraControl.java => Tutorial3Activity.java} | 10 +++++----- .../{SampleJavaCameraView.java => Tutorial3View.java} | 6 +++--- 11 files changed, 20 insertions(+), 20 deletions(-) rename samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/{Sample1Java.java => Tutorial1Activity.java} (97%) rename samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/{Sample2MixedProcessing.java => Tutorial2Activity.java} (97%) rename samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/{Sample3CameraControl.java => Tutorial3Activity.java} (93%) rename samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/{SampleJavaCameraView.java => Tutorial3View.java} (91%) diff --git a/samples/android/tutorial-1-camerapreview/AndroidManifest.xml b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml index 7732f282c8..47d45ed374 100644 --- a/samples/android/tutorial-1-camerapreview/AndroidManifest.xml +++ b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-1-camerapreview/res/values/strings.xml b/samples/android/tutorial-1-camerapreview/res/values/strings.xml index fa803da041..b7bea7d517 100644 --- a/samples/android/tutorial-1-camerapreview/res/values/strings.xml +++ b/samples/android/tutorial-1-camerapreview/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T1 Camera Preview + OCV T1 Preview diff --git a/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java similarity index 97% rename from samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java rename to samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java index 9e84ef71bb..cbac1649bc 100644 --- a/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java +++ b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java @@ -17,7 +17,7 @@ import android.view.SurfaceView; import android.view.WindowManager; import android.widget.Toast; -public class Sample1Java extends Activity implements CvCameraViewListener2 { +public class Tutorial1Activity extends Activity implements CvCameraViewListener2 { private static final String TAG = "OCVSample::Activity"; private CameraBridgeViewBase mOpenCvCameraView; @@ -41,7 +41,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 { } }; - public Sample1Java() { + public Tutorial1Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } diff --git a/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml index 5c6e487359..795dd204b0 100644 --- a/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml +++ b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt b/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt index bf62514d92..e8771ede1a 100644 --- a/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt +++ b/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-2-nativeprocessing) +set(sample example-tutorial-2-mixedprocessing) if(BUILD_FAT_JAVA_LIB) set(native_deps opencv_java) diff --git a/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp b/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp index d5d4e239c5..e7ed75d213 100644 --- a/samples/android/tutorial-2-mixedprocessing/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_tutorial2_Sample2NativeProcessing_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); +JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tuturial2Activity_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_tutorial2_Tutorial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) { Mat& mGr = *(Mat*)addrGray; Mat& mRgb = *(Mat*)addrRgba; diff --git a/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java b/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java similarity index 97% rename from samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java rename to samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java index c56fa87e38..eb84a1ec61 100644 --- a/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java +++ b/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java @@ -17,7 +17,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.WindowManager; -public class Sample2MixedProcessing extends Activity implements CvCameraViewListener2 { +public class Tutorial2Activity 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 Sample2MixedProcessing extends Activity implements CvCameraViewList } }; - public Sample2MixedProcessing() { + public Tutorial2Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } diff --git a/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml index fe7335449b..da90f95d86 100644 --- a/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml +++ b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml index dde812543d..79fef4eae4 100644 --- a/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml +++ b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - mResolutionList; private MenuItem[] mEffectMenuItems; private SubMenu mColorEffectsMenu; @@ -46,7 +46,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen { Log.i(TAG, "OpenCV loaded successfully"); mOpenCvCameraView.enableView(); - mOpenCvCameraView.setOnTouchListener(Sample3CameraControl.this); + mOpenCvCameraView.setOnTouchListener(Tutorial3Activity.this); } break; default: { @@ -56,7 +56,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen } }; - public Sample3CameraControl() { + public Tutorial3Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } @@ -69,7 +69,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen setContentView(R.layout.tutorial3_surface_view); - mOpenCvCameraView = (SampleJavaCameraView) findViewById(R.id.tutorial3_activity_java_surface_view); + mOpenCvCameraView = (Tutorial3View) findViewById(R.id.tutorial3_activity_java_surface_view); mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE); diff --git a/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/SampleJavaCameraView.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java similarity index 91% rename from samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/SampleJavaCameraView.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java index 38328a204d..04c163ff88 100644 --- a/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/SampleJavaCameraView.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java @@ -14,11 +14,11 @@ import android.hardware.Camera.Size; import android.util.AttributeSet; import android.util.Log; -public class SampleJavaCameraView extends JavaCameraView { +public class Tutorial3View extends JavaCameraView { - private static final String TAG = "Sample::SampleJavaCameraView"; + private static final String TAG = "Sample::Tutorial3View"; - public SampleJavaCameraView(Context context, AttributeSet attrs) { + public Tutorial3View(Context context, AttributeSet attrs) { super(context, attrs); }