Skip to content

O
opencv
Commit 24b05cb3 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #16196 from alalek:issue_13574

parents dff8e29f 9cd1d087
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java
View file @ 24b05cb3
...@@ -230,7 +230,7 @@ public class JavaCamera2View extends CameraBridgeViewBase { ...@@ -230,7 +230,7 @@ public class JavaCamera2View extends CameraBridgeViewBase {
@Override @Override
protected void disconnectCamera() { protected void disconnectCamera() {
Log.i(LOGTAG, "closeCamera"); Log.i(LOGTAG, "close camera");
try { try {
CameraDevice c = mCameraDevice; CameraDevice c = mCameraDevice;
mCameraDevice = null; mCameraDevice = null;
...@@ -241,13 +241,14 @@ public class JavaCamera2View extends CameraBridgeViewBase { ...@@ -241,13 +241,14 @@ public class JavaCamera2View extends CameraBridgeViewBase {
if (null != c) { if (null != c) {
c.close(); c.close();
} }
} finally {
stopBackgroundThread();
if (null != mImageReader) { if (null != mImageReader) {
mImageReader.close(); mImageReader.close();
mImageReader = null; mImageReader = null;
} }
} finally {
stopBackgroundThread();
} }
Log.i(LOGTAG, "camera closed!");
} }
public static class JavaCameraSizeAccessor implements ListItemAccessor { public static class JavaCameraSizeAccessor implements ListItemAccessor {
......
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