From 08cd51df1f93579a2e2263b946029550dc8c8841 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 5 Feb 2013 12:19:11 +0400 Subject: [PATCH] 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 - .../android/tutorial-3-native/AndroidManifest.xml | 38 -------- samples/android/tutorial-3-native/CMakeLists.txt | 12 --- samples/android/tutorial-3-native/jni/Android.mk | 11 --- .../android/tutorial-3-native/jni/Application.mk | 4 - samples/android/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 154712a..5b13b72 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 d3bb07b..0000000 --- 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 0ea6ad6..0000000 --- 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 2c27e65..0000000 --- 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 b080d2d..0000000 --- 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 164b81d..0000000 --- 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 c3c1970..0000000 --- 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 372d65a..0000000 --- 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 4fffcb2..0000000 --- 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 aa9acac..0000000 --- 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 41c5420..0000000 --- a/samples/android/tutorial-3-native/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - OCV T3 Add Native OpenCV - -- 2.7.4