Commit 8c40f0cc authored by Andrey Pavlenko's avatar Andrey Pavlenko

fixing build and lint warnings

parent c02095ae
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<lint> <lint>
<issue id="InlinedApi">
<ignore path="src\org\opencv\android\JavaCameraView.java" />
</issue>
<issue id="NewApi"> <issue id="NewApi">
<ignore path="src\org\opencv\android\JavaCameraView.java" /> <ignore path="src\org\opencv\android\JavaCameraView.java" />
</issue> </issue>
......
...@@ -74,6 +74,7 @@ public abstract class CameraBridgeViewBase extends SurfaceView implements Surfac ...@@ -74,6 +74,7 @@ public abstract class CameraBridgeViewBase extends SurfaceView implements Surfac
getHolder().addCallback(this); getHolder().addCallback(this);
mMaxWidth = MAX_UNSPECIFIED; mMaxWidth = MAX_UNSPECIFIED;
mMaxHeight = MAX_UNSPECIFIED; mMaxHeight = MAX_UNSPECIFIED;
styledAttrs.recycle();
} }
public interface CvCameraViewListener { public interface CvCameraViewListener {
...@@ -155,8 +156,6 @@ public abstract class CameraBridgeViewBase extends SurfaceView implements Surfac ...@@ -155,8 +156,6 @@ public abstract class CameraBridgeViewBase extends SurfaceView implements Surfac
mPreviewFormat = format; mPreviewFormat = format;
} }
private CvCameraViewListenerAdapter() {}
private int mPreviewFormat = Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA; private int mPreviewFormat = Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA;
private CvCameraViewListener mOldStyleListener; private CvCameraViewListener mOldStyleListener;
}; };
......
...@@ -267,9 +267,6 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb ...@@ -267,9 +267,6 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
mRgba.release(); mRgba.release();
} }
private JavaCameraFrame(CvCameraViewFrame obj) {
}
private Mat mYuvFrameData; private Mat mYuvFrameData;
private Mat mRgba; private Mat mRgba;
private int mWidth; private int mWidth;
......
...@@ -131,17 +131,17 @@ public class NativeCameraView extends CameraBridgeViewBase { ...@@ -131,17 +131,17 @@ public class NativeCameraView extends CameraBridgeViewBase {
} }
} }
private class NativeCameraFrame implements CvCameraViewFrame { private static class NativeCameraFrame implements CvCameraViewFrame {
@Override @Override
public Mat rgba() { public Mat rgba() {
mCamera.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); mCapture.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
return mRgba; return mRgba;
} }
@Override @Override
public Mat gray() { public Mat gray() {
mCamera.retrieve(mGray, Highgui.CV_CAP_ANDROID_GREY_FRAME); mCapture.retrieve(mGray, Highgui.CV_CAP_ANDROID_GREY_FRAME);
return mGray; return mGray;
} }
...@@ -158,9 +158,6 @@ public class NativeCameraView extends CameraBridgeViewBase { ...@@ -158,9 +158,6 @@ public class NativeCameraView extends CameraBridgeViewBase {
private class CameraWorker implements Runnable { private class CameraWorker implements Runnable {
private Mat mRgba = new Mat();
private Mat mGray = new Mat();
public void run() { public void run() {
do { do {
if (!mCamera.grab()) { if (!mCamera.grab()) {
......
...@@ -6,7 +6,6 @@ import org.opencv.android.OpenCVLoader; ...@@ -6,7 +6,6 @@ import org.opencv.android.OpenCVLoader;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle;
import android.util.Log; import android.util.Log;
public class CvNativeActivity extends Activity { public class CvNativeActivity extends Activity {
......
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:opencv="http://schemas.android.com/apk/res-auto" xmlns:opencv="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -20,4 +20,4 @@ ...@@ -20,4 +20,4 @@
opencv:show_fps="true" opencv:show_fps="true"
opencv:camera_id="any" /> opencv:camera_id="any" />
</LinearLayout> </FrameLayout>
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