From 8288cc108d2a9b0d140b911f470dd69041f7858d Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Fri, 15 Jul 2011 16:29:10 +0000 Subject: [PATCH] Continued Android samples renaming --- modules/java/android/AndroidManifest.xml | 9 --------- .../samples/{s0 => tutorial0}/Sample0Base.java | 0 .../samples/{s0 => tutorial0}/Sample0View.java | 0 .../{s0 => tutorial0}/SampleViewBase.java | 0 samples/android/tutorial-1-addopencv/.project | 2 +- .../samples/{s1 => tutorial1}/Sample1Java.java | 0 .../samples/{s1 => tutorial1}/Sample1View.java | 0 .../{s1 => tutorial1}/SampleViewBase.java | 0 .../android/tutorial-2-opencvcamera/.project | 6 +++--- .../AndroidManifest.xml | 4 ++-- .../res/values/strings.xml | 2 +- .../Sample2NativeCamera.java} | 8 ++++---- .../Sample2View.java} | 18 +++++++++--------- .../{s3 => tutorial2}/SampleViewBase.java | 2 +- samples/android/tutorial-3-native/.project | 2 +- .../tutorial-3-native/AndroidManifest.xml | 4 ++-- .../android/tutorial-3-native/jni/jni_part.cpp | 2 +- .../tutorial-3-native/res/values/strings.xml | 2 +- .../Sample3Native.java} | 8 ++++---- .../Sample3View.java} | 6 +++--- .../{s2 => tutorial3}/SampleViewBase.java | 2 +- samples/android/tutorial-4-mixed/.classpath | 2 +- samples/android/tutorial-4-mixed/.project | 6 +++--- .../tutorial-4-mixed/AndroidManifest.xml | 2 +- .../android/tutorial-4-mixed/jni/jni_part.cpp | 2 +- .../tutorial-4-mixed/res/values/strings.xml | 2 +- .../org/opencv/samples/s4/Sample4Mixed.java | 2 +- .../src/org/opencv/samples/s4/Sample4View.java | 2 +- .../org/opencv/samples/s4/SampleViewBase.java | 2 +- 29 files changed, 44 insertions(+), 53 deletions(-) rename samples/android/tutorial-0-androidcamera/src/org/opencv/samples/{s0 => tutorial0}/Sample0Base.java (100%) rename samples/android/tutorial-0-androidcamera/src/org/opencv/samples/{s0 => tutorial0}/Sample0View.java (100%) rename samples/android/tutorial-0-androidcamera/src/org/opencv/samples/{s0 => tutorial0}/SampleViewBase.java (100%) rename samples/android/tutorial-1-addopencv/src/org/opencv/samples/{s1 => tutorial1}/Sample1Java.java (100%) rename samples/android/tutorial-1-addopencv/src/org/opencv/samples/{s1 => tutorial1}/Sample1View.java (100%) rename samples/android/tutorial-1-addopencv/src/org/opencv/samples/{s1 => tutorial1}/SampleViewBase.java (100%) rename samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/{s3/Sample3NativeCamera.java => tutorial2/Sample2NativeCamera.java} (92%) rename samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/{s3/Sample3View.java => tutorial2/Sample2View.java} (85%) rename samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/{s3 => tutorial2}/SampleViewBase.java (98%) rename samples/android/tutorial-3-native/src/org/opencv/samples/{s2/Sample2Native.java => tutorial3/Sample3Native.java} (75%) rename samples/android/tutorial-3-native/src/org/opencv/samples/{s2/Sample2View.java => tutorial3/Sample3View.java} (85%) rename samples/android/tutorial-3-native/src/org/opencv/samples/{s2 => tutorial3}/SampleViewBase.java (98%) diff --git a/modules/java/android/AndroidManifest.xml b/modules/java/android/AndroidManifest.xml index acef991ee9..6e3abfd8be 100644 --- a/modules/java/android/AndroidManifest.xml +++ b/modules/java/android/AndroidManifest.xml @@ -3,13 +3,4 @@ package="org.opencv" android:versionCode="1" android:versionName="1.0"> - - - - - - - - diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java similarity index 100% rename from samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0View.java similarity index 100% rename from samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0View.java diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java similarity index 100% rename from samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java diff --git a/samples/android/tutorial-1-addopencv/.project b/samples/android/tutorial-1-addopencv/.project index 47f794738f..90ff95b55b 100644 --- a/samples/android/tutorial-1-addopencv/.project +++ b/samples/android/tutorial-1-addopencv/.project @@ -34,7 +34,7 @@ OpenCV-2.3.1_src 2 - _android_OpenCV-2_3_1_d2471b5d/src + _android_OpenCV_2_3_1_df28900a/src diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java similarity index 100% rename from samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java similarity index 100% rename from samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java similarity index 100% rename from samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java diff --git a/samples/android/tutorial-2-opencvcamera/.project b/samples/android/tutorial-2-opencvcamera/.project index 1452ef555f..5f1ca2cf5f 100644 --- a/samples/android/tutorial-2-opencvcamera/.project +++ b/samples/android/tutorial-2-opencvcamera/.project @@ -1,6 +1,6 @@ - Sample 3 Native Camera + Tutorial 1 Basic - 2. Use OpenCV Camera @@ -32,9 +32,9 @@ - opencv2.3.1_src + OpenCV-2.3.1_src 2 - _android_opencv2_3_1_d2471b5d/src + _android_OpenCV_2_3_1_df28900a/src diff --git a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml index 79323e7d28..accc3b2cf9 100644 --- a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml +++ b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -11,7 +11,7 @@ android:anyDensity="true" /> - diff --git a/samples/android/tutorial-2-opencvcamera/res/values/strings.xml b/samples/android/tutorial-2-opencvcamera/res/values/strings.xml index 581d9e67b2..51f727c30d 100644 --- a/samples/android/tutorial-2-opencvcamera/res/values/strings.xml +++ b/samples/android/tutorial-2-opencvcamera/res/values/strings.xml @@ -1,4 +1,4 @@ - Sample 3: Native Camera + Tutorial 1 Basic - 2. Use OpenCV Camera diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java similarity index 92% rename from samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java index d9c8c6a0a4..96979165a8 100644 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java +++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s3; +package org.opencv.samples.tutorial2; import android.app.Activity; import android.os.Bundle; @@ -7,7 +7,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.Window; -public class Sample3NativeCamera extends Activity { +public class Sample2NativeCamera extends Activity { private static final String TAG = "Sample::Activity"; public static final int VIEW_MODE_RGBA = 0; @@ -24,7 +24,7 @@ public class Sample3NativeCamera extends Activity { public static int viewMode = VIEW_MODE_RGBA; - public Sample3NativeCamera() { + public Sample2NativeCamera() { Log.i(TAG, "Instantiated new " + this.getClass()); } @@ -34,7 +34,7 @@ public class Sample3NativeCamera extends Activity { Log.i(TAG, "onCreate"); super.onCreate(savedInstanceState); requestWindowFeature(Window.FEATURE_NO_TITLE); - setContentView(new Sample3View(this)); + setContentView(new Sample2View(this)); } @Override diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java similarity index 85% rename from samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java index 4f2c7f9a45..b7138a24a4 100644 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java +++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s3; +package org.opencv.samples.tutorial2; import org.opencv.*; @@ -6,12 +6,12 @@ import android.content.Context; import android.graphics.Bitmap; import android.view.SurfaceHolder; -class Sample3View extends SampleViewBase { +class Sample2View extends SampleViewBase { private Mat mRgba; private Mat mGray; private Mat mIntermediateMat; - public Sample3View(Context context) { + public Sample2View(Context context) { super(context); } @@ -29,27 +29,27 @@ class Sample3View extends SampleViewBase { @Override protected Bitmap processFrame(VideoCapture capture) { - switch (Sample3NativeCamera.viewMode) { - case Sample3NativeCamera.VIEW_MODE_GRAY: + switch (Sample2NativeCamera.viewMode) { + case Sample2NativeCamera.VIEW_MODE_GRAY: capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME); imgproc.cvtColor(mGray, mRgba, imgproc.CV_GRAY2RGBA, 4); break; - case Sample3NativeCamera.VIEW_MODE_RGBA: + case Sample2NativeCamera.VIEW_MODE_RGBA: capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); core.putText(mRgba, "OpenCV + Android", new Point(10, 100), 3/* CV_FONT_HERSHEY_COMPLEX */, 2, new Scalar(255, 0, 0, 255), 3); break; - case Sample3NativeCamera.VIEW_MODE_CANNY: + case Sample2NativeCamera.VIEW_MODE_CANNY: capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME); imgproc.Canny(mGray, mIntermediateMat, 80, 100); imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); break; - case Sample3NativeCamera.VIEW_MODE_SOBEL: + case Sample2NativeCamera.VIEW_MODE_SOBEL: capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME); imgproc.Sobel(mGray, mIntermediateMat, CvType.CV_8U, 1, 1); core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 8); imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); break; - case Sample3NativeCamera.VIEW_MODE_BLUR: + case Sample2NativeCamera.VIEW_MODE_BLUR: capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); imgproc.blur(mRgba, mRgba, new Size(15, 15)); break; diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleViewBase.java similarity index 98% rename from samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleViewBase.java index 1ee37460f4..2f5c03ae31 100644 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java +++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleViewBase.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s3; +package org.opencv.samples.tutorial2; import java.util.List; diff --git a/samples/android/tutorial-3-native/.project b/samples/android/tutorial-3-native/.project index fcf32d8e84..e83271a323 100644 --- a/samples/android/tutorial-3-native/.project +++ b/samples/android/tutorial-3-native/.project @@ -1,6 +1,6 @@ - Sample 2 Native API + Tutorial 2 Advanced - 1. Add Native OpenCV diff --git a/samples/android/tutorial-3-native/AndroidManifest.xml b/samples/android/tutorial-3-native/AndroidManifest.xml index 167f8f2d08..145048e7fc 100644 --- a/samples/android/tutorial-3-native/AndroidManifest.xml +++ b/samples/android/tutorial-3-native/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -11,7 +11,7 @@ android:anyDensity="true" /> - diff --git a/samples/android/tutorial-3-native/jni/jni_part.cpp b/samples/android/tutorial-3-native/jni/jni_part.cpp index eee1adeb8c..3d6a6c6548 100644 --- a/samples/android/tutorial-3-native/jni/jni_part.cpp +++ b/samples/android/tutorial-3-native/jni/jni_part.cpp @@ -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); diff --git a/samples/android/tutorial-3-native/res/values/strings.xml b/samples/android/tutorial-3-native/res/values/strings.xml index 9f3a6779ac..7552751586 100644 --- a/samples/android/tutorial-3-native/res/values/strings.xml +++ b/samples/android/tutorial-3-native/res/values/strings.xml @@ -1,4 +1,4 @@ - Sample 2: Native API + Tutorial 2 Advanced - 1. Add Native OpenCV diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java similarity index 75% rename from samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java rename to samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java index 8e38916e18..e13ee140ae 100644 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java +++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java @@ -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)); } } diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java similarity index 85% rename from samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java rename to samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java index 8740c5cd0a..8076bd5ca1 100644 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java +++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java @@ -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); } diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java similarity index 98% rename from samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java rename to samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java index 9a0daeffaf..962fe693ea 100644 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java +++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s2; +package org.opencv.samples.tutorial3; import java.util.List; diff --git a/samples/android/tutorial-4-mixed/.classpath b/samples/android/tutorial-4-mixed/.classpath index da04f5de0f..a0a90f9b1c 100644 --- a/samples/android/tutorial-4-mixed/.classpath +++ b/samples/android/tutorial-4-mixed/.classpath @@ -3,6 +3,6 @@ - + diff --git a/samples/android/tutorial-4-mixed/.project b/samples/android/tutorial-4-mixed/.project index 62a02e4762..84ac074a74 100644 --- a/samples/android/tutorial-4-mixed/.project +++ b/samples/android/tutorial-4-mixed/.project @@ -1,6 +1,6 @@ - Sample 4 Mixed + Tutorial 2 Advanced - 2. Mix Java\Native OpenCV @@ -32,9 +32,9 @@ - opencv2.3.1_src + OpenCV-2.3.1_src 2 - _android_opencv2_3_1_d2471b5d/src + _android_OpenCV_2_3_1_df28900a/src diff --git a/samples/android/tutorial-4-mixed/AndroidManifest.xml b/samples/android/tutorial-4-mixed/AndroidManifest.xml index 46b9e2933c..3201f7c041 100644 --- a/samples/android/tutorial-4-mixed/AndroidManifest.xml +++ b/samples/android/tutorial-4-mixed/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/samples/android/tutorial-4-mixed/jni/jni_part.cpp b/samples/android/tutorial-4-mixed/jni/jni_part.cpp index c2553a81b0..dd989e6524 100644 --- a/samples/android/tutorial-4-mixed/jni/jni_part.cpp +++ b/samples/android/tutorial-4-mixed/jni/jni_part.cpp @@ -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; diff --git a/samples/android/tutorial-4-mixed/res/values/strings.xml b/samples/android/tutorial-4-mixed/res/values/strings.xml index 50d603646d..63b97c0113 100644 --- a/samples/android/tutorial-4-mixed/res/values/strings.xml +++ b/samples/android/tutorial-4-mixed/res/values/strings.xml @@ -1,4 +1,4 @@ - Sample 4: Mixed + Tutorial 2 Advanced - 2. Mix Java\Native OpenCV diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java index 5a57e21bb5..b8c382077b 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s4; +package org.opencv.samples.tutorial4; import android.app.Activity; import android.os.Bundle; diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java index 6df2159dad..b8e54f8d94 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s4; +package org.opencv.samples.tutorial4; import org.opencv.*; diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java index 13ac061f7f..fb18441413 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s4; +package org.opencv.samples.tutorial4; import java.util.List;