Merge release 2.4.3

This commit is contained in:
Andrey Kamaev
2012-11-02 17:45:58 +04:00
126 changed files with 61518 additions and 51142 deletions

View File

@@ -50,7 +50,7 @@ public class FdActivity extends Activity implements CvCameraViewListener {
private int mDetectorType = JAVA_DETECTOR;
private String[] mDetectorName;
private float mRelativeFaceSize = 0;
private float mRelativeFaceSize = 0.2f;
private int mAbsoluteFaceSize = 0;
private CameraBridgeViewBase mOpenCvCameraView;
@@ -132,7 +132,8 @@ public class FdActivity extends Activity implements CvCameraViewListener {
@Override
public void onPause()
{
mOpenCvCameraView.disableView();
if (mOpenCvCameraView != null)
mOpenCvCameraView.disableView();
super.onPause();
}