Merge pull request #904 from ograycode:2.4

324cafdd · Roman Donchenko · OpenCV Buildbot · 519ee72f · 97e9368e · 324cafdd
Commit 324cafdd authored May 22, 2013 by Roman Donchenko Committed by OpenCV Buildbot May 22, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

android+CameraBridgeViewBase.java ...java/generator/src/java/android+CameraBridgeViewBase.java +8 -0

No files found.
--- a/modules/java/generator/src/java/android+CameraBridgeViewBase.java
+++ b/modules/java/generator/src/java/android+CameraBridgeViewBase.java
@@ -80,6 +80,14 @@ public abstract class CameraBridgeViewBase extends SurfaceView implements Surfac
        mMaxHeight = MAX_UNSPECIFIED;
        styledAttrs.recycle();
    }
+    
+    /**
+     * Sets the camera index
+     * @param camera index
+     */
+    public void setCameraIndex(int cameraIndex) {
+        this.mCameraIndex = cameraIndex;
+    }

    public interface CvCameraViewListener {
        /**