generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Continued Android samples renaming

Browse Source
This commit is contained in:
Andrey Kamaev
2011-07-15 16:29:10 +00:00
parent b1ed277110
commit 8288cc108d
29 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/android/tutorial-4-mixed/.classpath
View File

@@ -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>

6
samples/android/tutorial-4-mixed/.project
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Sample 4 Mixed</name>
<name>Tutorial 2 Advanced - 2. Mix Java\Native 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_df28900a/src</locationURI>
</link>
</linkedResources>
</projectDescription>

2
samples/android/tutorial-4-mixed/AndroidManifest.xml
View File

@@ -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.s4"
package="org.opencv.samples.tutorial4"
android:versionCode="1"
android:versionName="1.0">

2
samples/android/tutorial-4-mixed/jni/jni_part.cpp
View File

@@ -8,7 +8,7 @@ using namespace std;
using namespace cv;
extern "C" {
JNIEXPORT void JNICALL Java_org_opencv_samples_s4_Sample4View_FindFeatures(JNIEnv* env, jobject thiz, jlong addrGray, jlong addrRgba)
JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Sample4View_FindFeatures(JNIEnv* env, jobject thiz, jlong addrGray, jlong addrRgba)
{
Mat* pMatGr=(Mat*)addrGray;
Mat* pMatRgb=(Mat*)addrRgba;

2
samples/android/tutorial-4-mixed/res/values/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Sample 4: Mixed</string>
<string name="app_name">Tutorial 2 Advanced - 2. Mix Java\Native OpenCV</string>
</resources>

2
samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java
View File

@@ -1,4 +1,4 @@
package org.opencv.samples.s4;
package org.opencv.samples.tutorial4;
import android.app.Activity;
import android.os.Bundle;

2
samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java
View File

@@ -1,4 +1,4 @@
package org.opencv.samples.s4;
package org.opencv.samples.tutorial4;
import org.opencv.*;

2
samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java
View File

@@ -1,4 +1,4 @@
package org.opencv.samples.s4;
package org.opencv.samples.tutorial4;
import java.util.List;