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

Merge pull request #5429 from PhilLab:patch-6

Browse Source
This commit is contained in:
Alexander Alekhin 2015-10-05 12:50:17 +00:00
commit 33f5ac5c15
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/java/generator/src/java/android+CameraBridgeViewBase.java
View File

@ -3,10 +3,8 @@ package org.opencv.android;
import java.util.List; import java.util.List;
import org.opencv.R; import org.opencv.R;
import org.opencv.android.Utils;
import org.opencv.core.Mat; import org.opencv.core.Mat;
import org.opencv.core.Size; import org.opencv.core.Size;
import org.opencv.videoio.Videoio;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -451,7 +449,7 @@ public abstract class CameraBridgeViewBase extends SurfaceView implements Surfac
*/ */
protected abstract void disconnectCamera(); protected abstract void disconnectCamera();
// NOTE: On Android 4.1.x the function must be called before SurfaceTextre constructor! // NOTE: On Android 4.1.x the function must be called before SurfaceTexture constructor!
protected void AllocateCache() protected void AllocateCache()
{ {
mCacheBitmap = Bitmap.createBitmap(mFrameWidth, mFrameHeight, Bitmap.Config.ARGB_8888); mCacheBitmap = Bitmap.createBitmap(mFrameWidth, mFrameHeight, Bitmap.Config.ARGB_8888);