From 139cc61001231072a32c139d6bba8a42b4c7aa4b Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 2 Jul 2012 14:19:14 +0000 Subject: [PATCH] Application start without service fixed. --- .../src/org/opencv/samples/puzzle15/puzzle15Activity.java | 1 - .../samples/colorblobdetect/ColorBlobDetectionActivity.java | 1 - .../face-detection/src/org/opencv/samples/fd/FdActivity.java | 1 - .../samples/imagemanipulations/ImageManipulationsActivity.java | 1 - .../src/org/opencv/samples/tutorial1/Sample1Java.java | 1 - .../src/org/opencv/samples/tutorial2/Sample2NativeCamera.java | 1 - .../src/org/opencv/samples/tutorial3/Sample3Native.java | 1 - .../src/org/opencv/samples/tutorial4/Sample4Mixed.java | 1 - 8 files changed, 8 deletions(-) diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java index 5a1b7772a6..f0c076cd60 100644 --- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java +++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java @@ -97,7 +97,6 @@ public class puzzle15Activity extends Activity if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); - finish(); } } diff --git a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java index 61f7db3907..e4629e1857 100644 --- a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java +++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java @@ -91,7 +91,6 @@ public class ColorBlobDetectionActivity extends Activity { if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); - finish(); } } } \ No newline at end of file diff --git a/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java b/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java index 5494000bb5..7359ea313c 100644 --- a/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java +++ b/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java @@ -110,7 +110,6 @@ public class FdActivity extends Activity { if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); - finish(); } } diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java index d595165e8b..03c4cca386 100644 --- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java +++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java @@ -112,7 +112,6 @@ public class ImageManipulationsActivity extends Activity { if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); - finish(); } } diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java index 645f4f1867..d385409fe1 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java @@ -94,7 +94,6 @@ public class Sample1Java extends Activity { if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); - finish(); } } diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java index 706f0a5779..69012bce1f 100644 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java +++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java @@ -100,7 +100,6 @@ public class Sample2NativeCamera extends Activity { if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); - finish(); } } diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java index 201ba16afc..6d67de31eb 100644 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java +++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java @@ -91,7 +91,6 @@ public class Sample3Native extends Activity { if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); - finish(); } } } diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java index fd11f4e27b..13798c9a48 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java @@ -101,7 +101,6 @@ public class Sample4Mixed extends Activity { if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); - finish(); } }