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-3-native/.project
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Sample 2 Native API</name>
<name>Tutorial 2 Advanced - 1. Add Native OpenCV</name>
<comment></comment>
<projects>
</projects>

4
samples/android/tutorial-3-native/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.s2"
package="org.opencv.samples.tutorial3"
android:versionCode="1"
android:versionName="1.0">
@@ -11,7 +11,7 @@
android:anyDensity="true" />
<application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="Sample2Native"
<activity android:name="Sample3Native"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">

2
samples/android/tutorial-3-native/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_s2_Sample2View_FindFeatures(JNIEnv* env, jobject thiz, jint width, jint height, jbyteArray yuv, jintArray rgba)
JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial3_Sample3View_FindFeatures(JNIEnv* env, jobject thiz, jint width, jint height, jbyteArray yuv, jintArray rgba)
{
jbyte* _yuv = env->GetByteArrayElements(yuv, 0);
jint* _rgba = env->GetIntArrayElements(rgba, 0);

2
samples/android/tutorial-3-native/res/values/strings.xml
View File

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

8
samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java → samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
View File

@@ -1,14 +1,14 @@
package org.opencv.samples.s2;
package org.opencv.samples.tutorial3;
import android.app.Activity;
import android.os.Bundle;
import android.util.Log;
import android.view.Window;
public class Sample2Native extends Activity {
public class Sample3Native extends Activity {
private static final String TAG = "Sample::Activity";
public Sample2Native() {
public Sample3Native() {
Log.i(TAG, "Instantiated new " + this.getClass());
}
@@ -18,6 +18,6 @@ public class Sample2Native extends Activity {
Log.i(TAG, "onCreate");
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(new Sample2View(this));
setContentView(new Sample3View(this));
}
}

6
samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java → samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java
View File

@@ -1,11 +1,11 @@
package org.opencv.samples.s2;
package org.opencv.samples.tutorial3;
import android.content.Context;
import android.graphics.Bitmap;
class Sample2View extends SampleViewBase {
class Sample3View extends SampleViewBase {
public Sample2View(Context context) {
public Sample3View(Context context) {
super(context);
}

2
samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java → samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java
View File

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