Commit 076941bb authored by Alexander Smorkalov's avatar Alexander Smorkalov

15-puzzle app reverted to usage of old CvCameraViewListener implementation;

super.onPause() call moved to begining of onPause method according Google recomandations.
parent f8720ec6
...@@ -263,7 +263,7 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb ...@@ -263,7 +263,7 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
mWidth = width; mWidth = width;
mHeight = height; mHeight = height;
mYuvFrameData = Yuv420sp; mYuvFrameData = Yuv420sp;
mRgba = new Mat(mHeight, mWidth, CvType.CV_8UC4); mRgba = new Mat();
} }
public void release() { public void release() {
......
package org.opencv.samples.puzzle15; package org.opencv.samples.puzzle15;
import org.opencv.android.BaseLoaderCallback; import org.opencv.android.BaseLoaderCallback;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewFrame;
import org.opencv.android.LoaderCallbackInterface; import org.opencv.android.LoaderCallbackInterface;
import org.opencv.android.OpenCVLoader; import org.opencv.android.OpenCVLoader;
import org.opencv.core.Mat; import org.opencv.core.Mat;
import org.opencv.android.CameraBridgeViewBase; import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener2; import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
import android.os.Bundle; import android.os.Bundle;
import android.app.Activity; import android.app.Activity;
...@@ -17,7 +16,7 @@ import android.view.MotionEvent; ...@@ -17,7 +16,7 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
public class Puzzle15Activity extends Activity implements CvCameraViewListener2, View.OnTouchListener { public class Puzzle15Activity extends Activity implements CvCameraViewListener, View.OnTouchListener {
private static final String TAG = "Sample::Puzzle15::Activity"; private static final String TAG = "Sample::Puzzle15::Activity";
...@@ -64,9 +63,9 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener2, ...@@ -64,9 +63,9 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener2,
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
...@@ -127,7 +126,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener2, ...@@ -127,7 +126,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener2,
return false; return false;
} }
public Mat onCameraFrame(CvCameraViewFrame inputFrame) { public Mat onCameraFrame(Mat inputFrame) {
return mPuzzle15.puzzleFrame(inputFrame.rgba()); return mPuzzle15.puzzleFrame(inputFrame);
} }
} }
...@@ -79,9 +79,9 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe ...@@ -79,9 +79,9 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
......
...@@ -130,9 +130,9 @@ public class FdActivity extends Activity implements CvCameraViewListener2 { ...@@ -130,9 +130,9 @@ public class FdActivity extends Activity implements CvCameraViewListener2 {
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
......
...@@ -112,9 +112,9 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView ...@@ -112,9 +112,9 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
......
...@@ -67,9 +67,9 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 { ...@@ -67,9 +67,9 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 {
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
......
...@@ -73,9 +73,9 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene ...@@ -73,9 +73,9 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
......
...@@ -62,9 +62,9 @@ public class Sample3Native extends Activity implements CvCameraViewListener2 { ...@@ -62,9 +62,9 @@ public class Sample3Native extends Activity implements CvCameraViewListener2 {
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
......
...@@ -88,9 +88,9 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener2 { ...@@ -88,9 +88,9 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener2 {
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
......
...@@ -79,9 +79,9 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen ...@@ -79,9 +79,9 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen
@Override @Override
public void onPause() public void onPause()
{ {
super.onPause();
if (mOpenCvCameraView != null) if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView(); mOpenCvCameraView.disableView();
super.onPause();
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment