diff --git a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/SampleCvViewBase.java b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/SampleCvViewBase.java index a9190861d4..0e2e0459aa 100644 --- a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/SampleCvViewBase.java +++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/SampleCvViewBase.java @@ -52,7 +52,7 @@ public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHol } public void setupCamera(int width, int height) { - Log.i(TAG, "setupCamera"); + Log.i(TAG, "setupCamera("+width+", "+height+")"); synchronized (this) { if (mCamera != null && mCamera.isOpened()) { List sizes = mCamera.getSupportedPreviewSizes(); diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java index 67902373b8..19a1523c03 100644 --- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java +++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java @@ -54,7 +54,7 @@ public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHol } public void setupCamera(int width, int height) { - Log.i(TAG, "setupCamera"); + Log.i(TAG, "setupCamera("+width+", "+height+")"); synchronized (this) { if (mCamera != null && mCamera.isOpened()) { List sizes = mCamera.getSupportedPreviewSizes(); diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0View.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0View.java index bf3cede668..cabb510ca3 100644 --- a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0View.java +++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0View.java @@ -62,8 +62,8 @@ class Sample0View extends SampleViewBase { } @Override - protected void onPreviewStared(int previewWidth, int previewHeight) { - Log.i(TAG, "onPreviewStared("+previewWidth+", "+previewHeight+")"); + protected void onPreviewStarted(int previewWidth, int previewHeight) { + Log.i(TAG, "onPreviewStarted("+previewWidth+", "+previewHeight+")"); /* Create a bitmap that will be used through to calculate the image to */ mBitmap = Bitmap.createBitmap(previewWidth, previewHeight, Bitmap.Config.ARGB_8888); mRGBA = new int[previewWidth * previewHeight]; diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java index 4a5154fb83..c0687951de 100644 --- a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java +++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java @@ -132,7 +132,7 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde } /* Notify that the preview is about to be started and deliver preview size */ - onPreviewStared(params.getPreviewSize().width, params.getPreviewSize().height); + onPreviewStarted(params.getPreviewSize().width, params.getPreviewSize().height); /* Now we can start a preview */ mCamera.startPreview(); @@ -159,17 +159,17 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde protected abstract Bitmap processFrame(byte[] data); /** - * This method is called when the preview process is beeing started. It is called before the first frame delivered and processFrame is called + * This method is called when the preview process is being started. It is called before the first frame delivered and processFrame is called * It is called with the width and height parameters of the preview process. It can be used to prepare the data needed during the frame processing. * @param previewWidth - the width of the preview frames that will be delivered via processFrame * @param previewHeight - the height of the preview frames that will be delivered via processFrame */ - protected abstract void onPreviewStared(int previewWidtd, int previewHeight); + protected abstract void onPreviewStarted(int previewWidtd, int previewHeight); /** * This method is called when preview is stopped. When this method is called the preview stopped and all the processing of frames already completed. * If the Bitmap object returned via processFrame is cached - it is a good time to recycle it. - * Any other resourcses used during the preview can be released. + * Any other resources used during the preview can be released. */ protected abstract void onPreviewStopped(); diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java index 630b26db3a..114d1d57b9 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java @@ -31,7 +31,7 @@ class Sample1View extends SampleViewBase { } @Override - protected void onPreviewStared(int previewWidth, int previewHeight) { + protected void onPreviewStarted(int previewWidth, int previewHeight) { synchronized (this) { // initialize Mats before usage mYuv = new Mat(getFrameHeight() + getFrameHeight() / 2, getFrameWidth(), CvType.CV_8UC1); diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java index 349f0f872b..630b99bfb1 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java @@ -131,7 +131,7 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde } /* Notify that the preview is about to be started and deliver preview size */ - onPreviewStared(params.getPreviewSize().width, params.getPreviewSize().height); + onPreviewStarted(params.getPreviewSize().width, params.getPreviewSize().height); /* Now we can start a preview */ mCamera.startPreview(); @@ -158,17 +158,17 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde protected abstract Bitmap processFrame(byte[] data); /** - * This method is called when the preview process is beeing started. It is called before the first frame delivered and processFrame is called + * This method is called when the preview process is being started. It is called before the first frame delivered and processFrame is called * It is called with the width and height parameters of the preview process. It can be used to prepare the data needed during the frame processing. * @param previewWidth - the width of the preview frames that will be delivered via processFrame * @param previewHeight - the height of the preview frames that will be delivered via processFrame */ - protected abstract void onPreviewStared(int previewWidtd, int previewHeight); + protected abstract void onPreviewStarted(int previewWidtd, int previewHeight); /** * This method is called when preview is stopped. When this method is called the preview stopped and all the processing of frames already completed. * If the Bitmap object returned via processFrame is cached - it is a good time to recycle it. - * Any other resourcses used during the preview can be released. + * Any other resources used during the preview can be released. */ protected abstract void onPreviewStopped(); diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleCvViewBase.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleCvViewBase.java index 7c115ec9ac..a15f880035 100644 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleCvViewBase.java +++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleCvViewBase.java @@ -52,7 +52,7 @@ public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHol } public void setupCamera(int width, int height) { - Log.i(TAG, "setupCamera"); + Log.i(TAG, "setupCamera("+width+", "+height+")"); synchronized (this) { if (mCamera != null && mCamera.isOpened()) { List sizes = mCamera.getSupportedPreviewSizes(); diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java index 43450d5c4b..ebbc518832 100644 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java +++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java @@ -14,7 +14,7 @@ class Sample3View extends SampleViewBase { } @Override - protected void onPreviewStared(int previewWidtd, int previewHeight) { + protected void onPreviewStarted(int previewWidtd, int previewHeight) { mFrameSize = previewWidtd * previewHeight; mRGBA = new int[mFrameSize]; mBitmap = Bitmap.createBitmap(previewWidtd, previewHeight, Bitmap.Config.ARGB_8888); diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java index 91a169cd9a..26b17c9596 100644 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java +++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java @@ -130,7 +130,7 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde } /* Notify that the preview is about to be started and deliver preview size */ - onPreviewStared(params.getPreviewSize().width, params.getPreviewSize().height); + onPreviewStarted(params.getPreviewSize().width, params.getPreviewSize().height); /* Now we can start a preview */ mCamera.startPreview(); @@ -158,17 +158,17 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde protected abstract Bitmap processFrame(byte[] data); /** - * This method is called when the preview process is beeing started. It is called before the first frame delivered and processFrame is called + * This method is called when the preview process is being started. It is called before the first frame delivered and processFrame is called * It is called with the width and height parameters of the preview process. It can be used to prepare the data needed during the frame processing. * @param previewWidth - the width of the preview frames that will be delivered via processFrame * @param previewHeight - the height of the preview frames that will be delivered via processFrame */ - protected abstract void onPreviewStared(int previewWidtd, int previewHeight); + protected abstract void onPreviewStarted(int previewWidtd, int previewHeight); /** * This method is called when preview is stopped. When this method is called the preview stopped and all the processing of frames already completed. * If the Bitmap object returned via processFrame is cached - it is a good time to recycle it. - * Any other resourcses used during the preview can be released. + * Any other resources used during the preview can be released. */ protected abstract void onPreviewStopped(); diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java index 7eb9070d46..3b1143373a 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java @@ -29,7 +29,7 @@ class Sample4View extends SampleViewBase { } @Override - protected void onPreviewStared(int previewWidtd, int previewHeight) { + protected void onPreviewStarted(int previewWidtd, int previewHeight) { // initialize Mats before usage mYuv = new Mat(getFrameHeight() + getFrameHeight() / 2, getFrameWidth(), CvType.CV_8UC1); mGraySubmat = mYuv.submat(0, getFrameHeight(), 0, getFrameWidth()); diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java index 1c3d852de1..af58a8702d 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java @@ -130,7 +130,7 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde } /* Notify that the preview is about to be started and deliver preview size */ - onPreviewStared(params.getPreviewSize().width, params.getPreviewSize().height); + onPreviewStarted(params.getPreviewSize().width, params.getPreviewSize().height); /* Now we can start a preview */ mCamera.startPreview(); @@ -159,17 +159,17 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde protected abstract Bitmap processFrame(byte[] data); /** - * This method is called when the preview process is beeing started. It is called before the first frame delivered and processFrame is called + * This method is called when the preview process is being started. It is called before the first frame delivered and processFrame is called * It is called with the width and height parameters of the preview process. It can be used to prepare the data needed during the frame processing. * @param previewWidth - the width of the preview frames that will be delivered via processFrame * @param previewHeight - the height of the preview frames that will be delivered via processFrame */ - protected abstract void onPreviewStared(int previewWidtd, int previewHeight); + protected abstract void onPreviewStarted(int previewWidtd, int previewHeight); /** * This method is called when preview is stopped. When this method is called the preview stopped and all the processing of frames already completed. * If the Bitmap object returned via processFrame is cached - it is a good time to recycle it. - * Any other resourcses used during the preview can be released. + * Any other resources used during the preview can be released. */ protected abstract void onPreviewStopped();