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

Merge release 2.4.3.2

Browse Source
This commit is contained in:
Andrey Kamaev
2012-12-25 19:07:08 +04:00
parent 13b6a3a15e 04f3c19b9a
commit 132b5d6435
21 changed files with 296 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/java/generator/src/java/android+JavaCameraView.java
View File

@@ -124,7 +124,7 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
params.setPreviewSize((int)frameSize.width, (int)frameSize.height);
List<String> FocusModes = params.getSupportedFocusModes();
if (FocusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO))
if (FocusModes != null && FocusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO))
{
params.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
}