From: Alexander Smorkalov Date: Tue, 5 Feb 2013 08:19:11 +0000 (+0400) Subject: Tutorial-3 removed as dublicate part of tutorial-4. X-Git-Tag: accepted/2.0/20130307.220821~112^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08cd51df1f93579a2e2263b946029550dc8c8841;p=profile%2Fivi%2Fopencv.git Tutorial-3 removed as dublicate part of tutorial-4. --- 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 6304549..0000000 Binary files a/samples/android/tutorial-3-native/res/drawable/icon.png and /dev/null differ diff --git a/samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml b/samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml deleted file mode 100644 index 71cd6e0..0000000 --- a/samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 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 -