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

Merge pull request #3847 from mshabunin:android-build

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-03-26 16:56:49 +00:00
parent 1381564a84 dddba2637f
commit 77cbddf715
26 changed files with 129 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
View File

@@ -82,7 +82,7 @@ public class OpenCVTestRunner extends InstrumentationTestRunner {
// Using OpenCV Manager for initialization;
Log("Internal OpenCV library not found. Using OpenCV Manager for initialization");
OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, getContext(), mLoaderCallback);
OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_3_0_0, getContext(), mLoaderCallback);
synchronized (this) {
try {

16
modules/java/generator/src/java/android+OpenCVLoader.java
View File

@@ -47,6 +47,22 @@ public class OpenCVLoader
*/
public static final String OPENCV_VERSION_2_4_9 = "2.4.9";
/**
* OpenCV Library version 2.4.10.
*/
public static final String OPENCV_VERSION_2_4_10 = "2.4.10";
/**
* OpenCV Library version 2.4.11.
*/
public static final String OPENCV_VERSION_2_4_11 = "2.4.11";
/**
* OpenCV Library version 3.0.0.
*/
public static final String OPENCV_VERSION_3_0_0 = "3.0.0";
/**
* Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").
* @return Returns true is initialization of OpenCV was successful.