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

fix for #1954 (typos)

Browse Source
This commit is contained in:
Andrey Pavlenko 2012-05-17 19:36:38 +00:00
parent b82b4a640d
commit e3fc405393
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/SampleCvViewBase.java
View File

@ -52,7 +52,7 @@ public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHol
} }
public void setupCamera(int width, int height) { public void setupCamera(int width, int height) {
Log.i(TAG, "setupCamera"); Log.i(TAG, "setupCamera("+width+", "+height+")");
synchronized (this) { synchronized (this) {
if (mCamera != null && mCamera.isOpened()) { if (mCamera != null && mCamera.isOpened()) {
List<Size> sizes = mCamera.getSupportedPreviewSizes(); List<Size> sizes = mCamera.getSupportedPreviewSizes();

2
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java
View File

@ -54,7 +54,7 @@ public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHol
} }
public void setupCamera(int width, int height) { public void setupCamera(int width, int height) {
Log.i(TAG, "setupCamera"); Log.i(TAG, "setupCamera("+width+", "+height+")");
synchronized (this) { synchronized (this) {
if (mCamera != null && mCamera.isOpened()) { if (mCamera != null && mCamera.isOpened()) {
List<Size> sizes = mCamera.getSupportedPreviewSizes(); List<Size> sizes = mCamera.getSupportedPreviewSizes();

4
samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0View.java
View File

@ -62,8 +62,8 @@ class Sample0View extends SampleViewBase {
} }
@Override @Override
protected void onPreviewStared(int previewWidth, int previewHeight) { protected void onPreviewStarted(int previewWidth, int previewHeight) {
Log.i(TAG, "onPreviewStared("+previewWidth+", "+previewHeight+")"); Log.i(TAG, "onPreviewStarted("+previewWidth+", "+previewHeight+")");
/* Create a bitmap that will be used through to calculate the image to */ /* Create a bitmap that will be used through to calculate the image to */
mBitmap = Bitmap.createBitmap(previewWidth, previewHeight, Bitmap.Config.ARGB_8888); mBitmap = Bitmap.createBitmap(previewWidth, previewHeight, Bitmap.Config.ARGB_8888);
mRGBA = new int[previewWidth * previewHeight]; mRGBA = new int[previewWidth * previewHeight];

8
samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java
View File

@ -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 */ /* 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 */ /* Now we can start a preview */
mCamera.startPreview(); mCamera.startPreview();
@ -159,17 +159,17 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
protected abstract Bitmap processFrame(byte[] data); 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. * 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 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 * @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. * 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. * 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(); protected abstract void onPreviewStopped();

2
samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java
View File

@ -31,7 +31,7 @@ class Sample1View extends SampleViewBase {
} }
@Override @Override
protected void onPreviewStared(int previewWidth, int previewHeight) { protected void onPreviewStarted(int previewWidth, int previewHeight) {
synchronized (this) { synchronized (this) {
// initialize Mats before usage // initialize Mats before usage
mYuv = new Mat(getFrameHeight() + getFrameHeight() / 2, getFrameWidth(), CvType.CV_8UC1); mYuv = new Mat(getFrameHeight() + getFrameHeight() / 2, getFrameWidth(), CvType.CV_8UC1);

8
samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java
View File

@ -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 */ /* 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 */ /* Now we can start a preview */
mCamera.startPreview(); mCamera.startPreview();
@ -158,17 +158,17 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
protected abstract Bitmap processFrame(byte[] data); 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. * 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 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 * @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. * 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. * 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(); protected abstract void onPreviewStopped();

2
samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleCvViewBase.java
View File

@ -52,7 +52,7 @@ public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHol
} }
public void setupCamera(int width, int height) { public void setupCamera(int width, int height) {
Log.i(TAG, "setupCamera"); Log.i(TAG, "setupCamera("+width+", "+height+")");
synchronized (this) { synchronized (this) {
if (mCamera != null && mCamera.isOpened()) { if (mCamera != null && mCamera.isOpened()) {
List<Size> sizes = mCamera.getSupportedPreviewSizes(); List<Size> sizes = mCamera.getSupportedPreviewSizes();

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

@ -14,7 +14,7 @@ class Sample3View extends SampleViewBase {
} }
@Override @Override
protected void onPreviewStared(int previewWidtd, int previewHeight) { protected void onPreviewStarted(int previewWidtd, int previewHeight) {
mFrameSize = previewWidtd * previewHeight; mFrameSize = previewWidtd * previewHeight;
mRGBA = new int[mFrameSize]; mRGBA = new int[mFrameSize];
mBitmap = Bitmap.createBitmap(previewWidtd, previewHeight, Bitmap.Config.ARGB_8888); mBitmap = Bitmap.createBitmap(previewWidtd, previewHeight, Bitmap.Config.ARGB_8888);

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

@ -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 */ /* 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 */ /* Now we can start a preview */
mCamera.startPreview(); mCamera.startPreview();
@ -158,17 +158,17 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
protected abstract Bitmap processFrame(byte[] data); 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. * 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 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 * @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. * 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. * 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(); protected abstract void onPreviewStopped();

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

@ -29,7 +29,7 @@ class Sample4View extends SampleViewBase {
} }
@Override @Override
protected void onPreviewStared(int previewWidtd, int previewHeight) { protected void onPreviewStarted(int previewWidtd, int previewHeight) {
// initialize Mats before usage // initialize Mats before usage
mYuv = new Mat(getFrameHeight() + getFrameHeight() / 2, getFrameWidth(), CvType.CV_8UC1); mYuv = new Mat(getFrameHeight() + getFrameHeight() / 2, getFrameWidth(), CvType.CV_8UC1);
mGraySubmat = mYuv.submat(0, getFrameHeight(), 0, getFrameWidth()); mGraySubmat = mYuv.submat(0, getFrameHeight(), 0, getFrameWidth());

8
samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java
View File

@ -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 */ /* 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 */ /* Now we can start a preview */
mCamera.startPreview(); mCamera.startPreview();
@ -159,17 +159,17 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
protected abstract Bitmap processFrame(byte[] data); 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. * 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 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 * @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. * 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. * 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(); protected abstract void onPreviewStopped();